diff options
-rw-r--r-- | accessx-status/src/applet.c | 5 | ||||
-rw-r--r-- | battstat/battstat_applet.c | 32 | ||||
-rw-r--r-- | cpufreq/src/cpufreq-applet.c | 5 | ||||
-rw-r--r-- | cpufreq/src/cpufreq-monitor-libcpufreq.c | 10 | ||||
-rw-r--r-- | cpufreq/src/cpufreq-monitor-sysfs.c | 10 | ||||
-rw-r--r-- | mateweather/src/mateweather-applet.c | 9 | ||||
-rw-r--r-- | stickynotes/stickynotes.c | 8 |
7 files changed, 41 insertions, 38 deletions
diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c index 6b47bebd..d040a27e 100644 --- a/accessx-status/src/applet.c +++ b/accessx-status/src/applet.c @@ -179,8 +179,9 @@ dialog_cb (GtkAction* action, &error); if (!error) { - launch_context = gdk_display_get_app_launch_context ( - gtk_widget_get_display (GTK_WIDGET (sapplet->applet))); + launch_context = + gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (sapplet->applet))); + gdk_app_launch_context_set_screen (launch_context, screen); g_app_info_launch (appinfo, NULL, diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index f3b54c68..d89583ff 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -181,26 +181,26 @@ get_remaining (BatteryStatus *info) else if (hours == 0) if (!info->on_ac_power) - return g_strdup_printf (ngettext ( - "%d minute (%d%%) remaining", - "%d minutes (%d%%) remaining", - mins), mins, info->percent); + return g_strdup_printf (ngettext ("%d minute (%d%%) remaining", + "%d minutes (%d%%) remaining", + mins), + mins, info->percent); else - return g_strdup_printf (ngettext ( - "%d minute until charged (%d%%)", - "%d minutes until charged (%d%%)", - mins), mins, info->percent); + return g_strdup_printf (ngettext ("%d minute until charged (%d%%)", + "%d minutes until charged (%d%%)", + mins), + mins, info->percent); else if (mins == 0) if (!info->on_ac_power) - return g_strdup_printf (ngettext ( - "%d hour (%d%%) remaining", - "%d hours (%d%%) remaining", - hours), hours, info->percent); + return g_strdup_printf (ngettext ("%d hour (%d%%) remaining", + "%d hours (%d%%) remaining", + hours), + hours, info->percent); else - return g_strdup_printf (ngettext ( - "%d hour until charged (%d%%)", - "%d hours until charged (%d%%)", - hours), hours, info->percent); + return g_strdup_printf (ngettext ("%d hour until charged (%d%%)", + "%d hours until charged (%d%%)", + hours), + hours, info->percent); else if (!info->on_ac_power) /* TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes" diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index d965ed93..87fbc7af 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -813,8 +813,9 @@ cpufreq_applet_setup (CPUFreqApplet *applet) (gpointer) applet); /* Monitor */ - applet->monitor = cpufreq_monitor_factory_create_monitor ( - cpufreq_prefs_get_cpu (applet->prefs)); + applet->monitor = + cpufreq_monitor_factory_create_monitor (cpufreq_prefs_get_cpu (applet->prefs)); + cpufreq_monitor_run (applet->monitor); g_signal_connect_swapped (G_OBJECT (applet->monitor), "changed", G_CALLBACK (cpufreq_applet_update), diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c index d61349e0..cd0d3e53 100644 --- a/cpufreq/src/cpufreq-monitor-libcpufreq.c +++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c @@ -62,10 +62,12 @@ cpufreq_monitor_libcpufreq_constructor (GType type, gulong max_freq, min_freq; guint cpu; - object = G_OBJECT_CLASS ( - cpufreq_monitor_libcpufreq_parent_class)->constructor (type, - n_construct_properties, - construct_params); + object = + G_OBJECT_CLASS (cpufreq_monitor_libcpufreq_parent_class) + ->constructor (type, + n_construct_properties, + construct_params); + g_object_get (G_OBJECT (object), "cpu", &cpu, NULL); diff --git a/cpufreq/src/cpufreq-monitor-sysfs.c b/cpufreq/src/cpufreq-monitor-sysfs.c index 0d7f378a..8ea88de2 100644 --- a/cpufreq/src/cpufreq-monitor-sysfs.c +++ b/cpufreq/src/cpufreq-monitor-sysfs.c @@ -83,10 +83,12 @@ cpufreq_monitor_sysfs_constructor (GType type, guint cpu; GError *error = NULL; - object = G_OBJECT_CLASS ( - cpufreq_monitor_sysfs_parent_class)->constructor (type, - n_construct_properties, - construct_params); + object = + G_OBJECT_CLASS (cpufreq_monitor_sysfs_parent_class) + ->constructor (type, + n_construct_properties, + construct_params); + g_object_get (G_OBJECT (object), "cpu", &cpu, NULL); diff --git a/mateweather/src/mateweather-applet.c b/mateweather/src/mateweather-applet.c index 216571e0..d32d88bb 100644 --- a/mateweather/src/mateweather-applet.c +++ b/mateweather/src/mateweather-applet.c @@ -461,11 +461,10 @@ update_finish (WeatherInfo *info, gpointer data) message = g_strdup_printf ("%s: %s", weather_info_get_location_name (info), weather_info_get_sky (info)); - detail = g_strdup_printf ( - _("City: %s\nSky: %s\nTemperature: %s"), - weather_info_get_location_name (info), - weather_info_get_sky (info), - weather_info_get_temp_summary (info)); + detail = g_strdup_printf (_("City: %s\nSky: %s\nTemperature: %s"), + weather_info_get_location_name (info), + weather_info_get_sky (info), + weather_info_get_temp_summary (info)); icon = weather_info_get_icon_name (gw_applet->mateweather_info); if (icon == NULL) diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index b22f1aa9..21ea7c3b 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -62,9 +62,8 @@ set_icon_geometry (GdkWindow *window, XChangeProperty (dpy, GDK_WINDOW_XID (window), - gdk_x11_get_xatom_by_name_for_display ( - gdk_window_get_display (window), - "_NET_WM_ICON_GEOMETRY"), + gdk_x11_get_xatom_by_name_for_display (gdk_window_get_display (window), + "_NET_WM_ICON_GEOMETRY"), XA_CARDINAL, 32, PropModeReplace, (guchar *)&data, 4); } @@ -1053,8 +1052,7 @@ stickynotes_load (GdkScreen *screen) GtkTextBuffer *buffer; GtkTextIter start, end; - buffer = gtk_text_view_get_buffer ( - GTK_TEXT_VIEW (note->w_body)); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (note->w_body)); gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_insert (buffer, |