diff options
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/clock/calendar-window.c | 4 | ||||
| -rw-r--r-- | applets/clock/clock.c | 15 | ||||
| -rw-r--r-- | applets/notification_area/na-grid.c | 5 | ||||
| -rw-r--r-- | applets/notification_area/status-notifier/sn-host-v0.c | 3 | ||||
| -rw-r--r-- | applets/notification_area/status-notifier/sn-item-v0.c | 3 | ||||
| -rw-r--r-- | applets/notification_area/system-tray/na-tray-manager.c | 3 |
6 files changed, 19 insertions, 14 deletions
diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c index b4157344..cf6ef670 100644 --- a/applets/clock/calendar-window.c +++ b/applets/clock/calendar-window.c @@ -543,6 +543,8 @@ void calendar_window_set_show_weeks (CalendarWindow *calwin, gboolean show_weeks) { + GtkCalendarDisplayOptions options; + g_return_if_fail (CALENDAR_IS_WINDOW (calwin)); if (show_weeks == calwin->priv->show_weeks) @@ -551,8 +553,6 @@ calendar_window_set_show_weeks (CalendarWindow *calwin, calwin->priv->show_weeks = show_weeks; if (calwin->priv->calendar) { - GtkCalendarDisplayOptions options; - options = gtk_calendar_get_display_options (GTK_CALENDAR (calwin->priv->calendar)); if (show_weeks) diff --git a/applets/clock/clock.c b/applets/clock/clock.c index f97e56af..309d4884 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -2219,6 +2219,9 @@ location_set_current_cb (ClockLocation *loc, static void locations_changed (ClockData *cd) { + GSList *l; + glong id; + if (!cd->locations) { if (cd->weather_obox) gtk_widget_hide (cd->weather_obox); @@ -2233,9 +2236,8 @@ locations_changed (ClockData *cd) gtk_widget_show (cd->weather_obox); } - for (GSList *l = cd->locations; l; l = l->next) { + for (l = cd->locations; l; l = l->next) { ClockLocation *loc = l->data; - glong id; id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (loc), "weather-updated")); if (id == 0) { @@ -2512,6 +2514,7 @@ setup_gsettings (ClockData *cd) static GSList * parse_gsettings_cities (ClockData *cd, gchar **values) { + gint i; LocationParserData data; GMarkupParseContext *context; @@ -2521,7 +2524,7 @@ parse_gsettings_cities (ClockData *cd, gchar **values) context = g_markup_parse_context_new (&location_parser, 0, &data, NULL); if (values) { - for (gint i = 0; values[i]; i++) { + for (i = 0; values[i]; i++) { g_markup_parse_context_parse (context, values[i], strlen(values[i]), NULL); } } @@ -2586,11 +2589,11 @@ system_manager_signal_cb (GDBusProxy *proxy, GVariant *parameters, ClockData *cd) { + GVariant *variant; + gboolean active; + if (g_strcmp0 (signal_name, "PrepareForSleep") == 0) { - GVariant *variant; - gboolean active; - variant = g_variant_get_child_value (parameters, 0); active = g_variant_get_boolean (variant); g_variant_unref (variant); diff --git a/applets/notification_area/na-grid.c b/applets/notification_area/na-grid.c index 9a4c45d9..9698be6c 100644 --- a/applets/notification_area/na-grid.c +++ b/applets/notification_area/na-grid.c @@ -317,6 +317,8 @@ na_grid_realize (GtkWidget *widget) NaGrid *self = NA_GRID (widget); GdkScreen *screen; GdkDisplay *display; + GtkOrientation orientation; + NaHost *tray_host; GSettings *settings; GTK_WIDGET_CLASS (na_grid_parent_class)->realize (widget); @@ -326,9 +328,6 @@ na_grid_realize (GtkWidget *widget) screen = gtk_widget_get_screen (GTK_WIDGET (self)); if (GDK_IS_X11_DISPLAY (display)) { - GtkOrientation orientation; - NaHost *tray_host; - orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (self)); tray_host = na_tray_new_for_screen (screen, orientation); g_object_bind_property (self, "orientation", diff --git a/applets/notification_area/status-notifier/sn-host-v0.c b/applets/notification_area/status-notifier/sn-host-v0.c index 4ad6b359..64da5da9 100644 --- a/applets/notification_area/status-notifier/sn-host-v0.c +++ b/applets/notification_area/status-notifier/sn-host-v0.c @@ -193,6 +193,7 @@ register_host_cb (GObject *source_object, GError *error; SnHostV0 *v0; gchar **items; + gint i; error = NULL; sn_watcher_v0_gen_call_register_host_finish (SN_WATCHER_V0_GEN (source_object), @@ -223,7 +224,7 @@ register_host_cb (GObject *source_object, items = sn_watcher_v0_gen_dup_registered_items (v0->watcher); if (items) { - for (gint i = 0; items[i] != NULL; i++) + for (i = 0; items[i] != NULL; i++) add_registered_item (v0, items[i]); } diff --git a/applets/notification_area/status-notifier/sn-item-v0.c b/applets/notification_area/status-notifier/sn-item-v0.c index 9deab9d3..fd963c31 100644 --- a/applets/notification_area/status-notifier/sn-item-v0.c +++ b/applets/notification_area/status-notifier/sn-item-v0.c @@ -244,6 +244,7 @@ update (SnItemV0 *v0) GtkImage *image; SnTooltip *tip; gint icon_size; + gboolean visible; const gchar *icon_name; SnIconPixmap **icon_pixmap; @@ -361,7 +362,7 @@ update (SnItemV0 *v0) /* TODO: hide "Passive" items with a setting? */ /*Special case mate-polkit*/ if (g_strcmp0 (v0->status, "password-dialog") != 0){ - gboolean visible = g_strcmp0 (v0->status, "Passive") != 0; + visible = g_strcmp0 (v0->status, "Passive") != 0; gtk_widget_set_visible (GTK_WIDGET (v0), visible); } else diff --git a/applets/notification_area/system-tray/na-tray-manager.c b/applets/notification_area/system-tray/na-tray-manager.c index 2bb679d8..d4f27ff3 100644 --- a/applets/notification_area/system-tray/na-tray-manager.c +++ b/applets/notification_area/system-tray/na-tray-manager.c @@ -537,6 +537,7 @@ na_tray_manager_unmanage (NaTrayManager *manager) { #ifdef GDK_WINDOWING_X11 GdkDisplay *display; + guint32 timestamp; GtkWidget *invisible; GdkWindow *window; @@ -555,7 +556,7 @@ na_tray_manager_unmanage (NaTrayManager *manager) if (gdk_selection_owner_get_for_display (display, manager->selection_atom) == window) { - guint32 timestamp = gdk_x11_get_server_time (window); + timestamp = gdk_x11_get_server_time (window); gdk_selection_owner_set_for_display (display, NULL, manager->selection_atom, |