From 592387b48c3b75fa130030ee1fc0fd3da841ba3d Mon Sep 17 00:00:00 2001 From: Peter Hofmann Date: Thu, 19 Jun 2014 20:08:31 +0200 Subject: [PATCH] Keep the changed_* scheme for notify::* --- browser.c | 68 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/browser.c b/browser.c index cc698bc..835951b 100644 --- a/browser.c +++ b/browser.c @@ -21,6 +21,7 @@ static WebKitWebView *client_new(const gchar *); static WebKitWebView *client_new_request(WebKitWebView *, WebKitWebFrame *, gpointer); static void cooperation_setup(void); +static void changed_download_progress(GObject *, GParamSpec *, gpointer); static void changed_load_progress(GObject *, GParamSpec *, gpointer); static void changed_title(GObject *, GParamSpec *, gpointer); static void changed_uri(GObject *, GParamSpec *, gpointer); @@ -30,7 +31,6 @@ static gboolean download_request(WebKitWebView *, WebKitWebFrame *, WebKitNetworkRequest *, gchar *, WebKitWebPolicyDecision *, gpointer); static void downloadmanager_cancel(GtkToolButton *, gpointer data); -static void downloadmanager_progress(GObject *, GParamSpec *, gpointer); static void downloadmanager_setup(void); static gchar *ensure_url_scheme(const gchar *); static void grab_environment_configuration(void); @@ -344,6 +344,38 @@ cooperation_setup(void) g_free(fifopath); } +void +changed_download_progress(GObject *obj, GParamSpec *pspec, gpointer data) +{ + WebKitDownload *download = WEBKIT_DOWNLOAD(obj); + GtkToolItem *tb = GTK_TOOL_ITEM(data); + gdouble p; + const gchar *uri; + gchar *t, *filename, *base; + + p = webkit_download_get_progress(download) * 100; + + uri = webkit_download_get_destination_uri(download); + filename = g_filename_from_uri(uri, NULL, NULL); + if (filename == NULL) + { + /* This really should not happen because WebKit uses that URI to + * write to a file... */ + fprintf(stderr, __NAME__": Could not construct file name from URI!\n"); + t = g_strdup_printf("%s (%.0f%%)", + webkit_download_get_suggested_filename(download), p); + } + else + { + base = g_path_get_basename(filename); + t = g_strdup_printf("%s (%.0f%%)", base, p); + g_free(filename); + g_free(base); + } + gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t); + g_free(t); +} + void changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data) { @@ -418,7 +450,7 @@ download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data gtk_widget_show_all(dm.toolbar); g_signal_connect(G_OBJECT(download), "notify::progress", - G_CALLBACK(downloadmanager_progress), tb); + G_CALLBACK(changed_download_progress), tb); g_object_ref(download); g_signal_connect(G_OBJECT(tb), "clicked", @@ -467,38 +499,6 @@ downloadmanager_cancel(GtkToolButton *tb, gpointer data) gtk_widget_destroy(GTK_WIDGET(tb)); } -void -downloadmanager_progress(GObject *obj, GParamSpec *pspec, gpointer data) -{ - WebKitDownload *download = WEBKIT_DOWNLOAD(obj); - GtkToolItem *tb = GTK_TOOL_ITEM(data); - gdouble p; - const gchar *uri; - gchar *t, *filename, *base; - - p = webkit_download_get_progress(download) * 100; - - uri = webkit_download_get_destination_uri(download); - filename = g_filename_from_uri(uri, NULL, NULL); - if (filename == NULL) - { - /* This really should not happen because WebKit uses that URI to - * write to a file... */ - fprintf(stderr, __NAME__": Could not construct file name from URI!\n"); - t = g_strdup_printf("%s (%.0f%%)", - webkit_download_get_suggested_filename(download), p); - } - else - { - base = g_path_get_basename(filename); - t = g_strdup_printf("%s (%.0f%%)", base, p); - g_free(filename); - g_free(base); - } - gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t); - g_free(t); -} - void downloadmanager_setup(void) { -- 2.39.2