[gnome-applets] window-title: fix -Wdeclaration-after-statement warnings

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 074535572642078f11d8daf7c00a901ba3595a32
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 21:43:16 2020 +0300

    window-title: fix -Wdeclaration-after-statement warnings

 gnome-applets/window-title/preferences.c  | 49 ++++++++++++++++++++-----------
 gnome-applets/window-title/window-title.c | 44 +++++++++++++++++----------
 2 files changed, 61 insertions(+), 32 deletions(-)
---
diff --git a/gnome-applets/window-title/preferences.c b/gnome-applets/window-title/preferences.c
index 13e8409bf..195e6c0d8 100755
--- a/gnome-applets/window-title/preferences.c
+++ b/gnome-applets/window-title/preferences.c
@@ -204,6 +204,22 @@ wt_applet_properties_cb (GSimpleAction *action,
 {
        WTApplet *wtapplet;
        GdkColor btn_color_color;
+       GtkToggleButton *chkb_only_maximized;
+       GtkToggleButton *chkb_hide_on_unmaximized;
+       GtkToggleButton *chkb_hide_icon;
+       GtkToggleButton *chkb_hide_title;
+       GtkToggleButton *chkb_swap_order;
+       GtkToggleButton *chkb_expand_applet;
+       GtkToggleButton *chkb_custom_style;
+       GtkToggleButton *chkb_show_window_menu;
+       GtkToggleButton *chkb_show_tooltips;
+       GtkHScale *scale_alignment;
+       GtkColorButton *btn_color_active;
+       GtkFontButton *btn_font_active;
+       GtkColorButton *btn_color_inactive;
+       GtkFontButton *btn_font_inactive;
+       GtkButton *btn_close;
+       GtkGrid *grid_custom_style;
 
        wtapplet = (WTApplet *) user_data;
 
@@ -216,23 +232,22 @@ wt_applet_properties_cb (GSimpleAction *action,
        }
        //gtk_builder_connect_signals (wtapplet->prefbuilder, NULL); // no need for now
 
-       GtkToggleButton
-               *chkb_only_maximized = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_ONLY_MAXIMIZED)),
-               *chkb_hide_on_unmaximized = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_HIDE_ON_UNMAXIMIZED)),
-               *chkb_hide_icon = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_HIDE_ICON)),
-               *chkb_hide_title = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_HIDE_TITLE)),
-               *chkb_swap_order = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_SWAP_ORDER)),
-               *chkb_expand_applet = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_EXPAND_APPLET)),
-               *chkb_custom_style = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_CUSTOM_STYLE)),
-               *chkb_show_window_menu = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_SHOW_WINDOW_MENU)),
-               *chkb_show_tooltips = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_SHOW_TOOLTIPS));
-       GtkHScale *scale_alignment = GTK_HSCALE (gtk_builder_get_object(wtapplet->prefbuilder, 
"scale_alignment"));
-       GtkColorButton *btn_color_active = GTK_COLOR_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_color_active"));
-       GtkFontButton *btn_font_active = GTK_FONT_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_font_active"));
-       GtkColorButton *btn_color_inactive = GTK_COLOR_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_color_inactive"));
-       GtkFontButton *btn_font_inactive = GTK_FONT_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_font_inactive"));
-       GtkButton *btn_close = GTK_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, "btn_close"));
-       GtkGrid *grid_custom_style = GTK_GRID (gtk_builder_get_object (wtapplet->prefbuilder, 
"grid_custom_style"));
+       chkb_only_maximized = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_ONLY_MAXIMIZED));
+       chkb_hide_on_unmaximized = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_HIDE_ON_UNMAXIMIZED));
+       chkb_hide_icon = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, CFG_HIDE_ICON));
+       chkb_hide_title = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, CFG_HIDE_TITLE));
+       chkb_swap_order = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, CFG_SWAP_ORDER));
+       chkb_expand_applet = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_EXPAND_APPLET));
+       chkb_custom_style = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_CUSTOM_STYLE));
+       chkb_show_window_menu = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_SHOW_WINDOW_MENU));
+       chkb_show_tooltips = GTK_TOGGLE_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
CFG_SHOW_TOOLTIPS));
+       scale_alignment = GTK_HSCALE (gtk_builder_get_object(wtapplet->prefbuilder, "scale_alignment"));
+       btn_color_active = GTK_COLOR_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_color_active"));
+       btn_font_active = GTK_FONT_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, "btn_font_active"));
+       btn_color_inactive = GTK_COLOR_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_color_inactive"));
+       btn_font_inactive = GTK_FONT_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, 
"btn_font_inactive"));
+       btn_close = GTK_BUTTON (gtk_builder_get_object(wtapplet->prefbuilder, "btn_close"));
+       grid_custom_style = GTK_GRID (gtk_builder_get_object (wtapplet->prefbuilder, "grid_custom_style"));
 
        // set widgets according to preferences
        gtk_toggle_button_set_active (chkb_only_maximized, wtapplet->prefs->only_maximized);
diff --git a/gnome-applets/window-title/window-title.c b/gnome-applets/window-title/window-title.c
index 66a155085..654875ece 100755
--- a/gnome-applets/window-title/window-title.c
+++ b/gnome-applets/window-title/window-title.c
@@ -149,13 +149,17 @@ static WnckWindow *getRootWindow (WnckScreen *screen) {
                return NULL;
 }
 
-/* Returns the highest maximized window */
-static WnckWindow *getUpperMaximized (WTApplet *wtapplet) {
+static WnckWindow *
+getUpperMaximized (WTApplet *wtapplet)
+{
+       GList *windows;
+       WnckWindow *returnwindow;
+
        if (!wtapplet->prefs->only_maximized)
                return wtapplet->activewindow;
 
-       GList *windows = wnck_screen_get_windows_stacked(wtapplet->activescreen);
-       WnckWindow *returnwindow = NULL;
+       windows = wnck_screen_get_windows_stacked(wtapplet->activescreen);
+       returnwindow = NULL;
 
        while (windows && windows->data) {
                if (wnck_window_is_maximized(windows->data)) {
@@ -282,10 +286,15 @@ wt_applet_update_title (WTApplet *wtapplet)
        if (icon_pixbuf == NULL) {
                gtk_image_clear(wtapplet->icon);
        } else {
+               GdkPixbuf *ipb1;
+               GdkPixbuf *ipb2;
+
                // We're updating window info (Careful! We've had pixbuf memory leaks here)
-               GdkPixbuf *ipb1 = gdk_pixbuf_scale_simple(icon_pixbuf, ICON_WIDTH, ICON_HEIGHT, 
GDK_INTERP_BILINEAR);
+               ipb1 = gdk_pixbuf_scale_simple (icon_pixbuf, ICON_WIDTH, ICON_HEIGHT, GDK_INTERP_BILINEAR);
+
                if (controlledwindow == wtapplet->rootwindow) g_object_unref(icon_pixbuf); //this is stupid 
beyond belief, thanks to the retarded GTK framework
-               GdkPixbuf *ipb2 = gdk_pixbuf_rotate_simple(ipb1, wtapplet->angle);
+
+               ipb2 = gdk_pixbuf_rotate_simple (ipb1, wtapplet->angle);
                g_object_unref(ipb1);   // Unref ipb1 to get it cleared from memory (we still need ipb2)
 
                // Saturate icon when window is not focused
@@ -519,14 +528,15 @@ static void active_workspace_changed (WnckScreen *screen,
        */
 }
 
-static gboolean icon_clicked (GtkWidget *icon,
-                              GdkEventButton *event,
-                              WTApplet *wtapplet)
+static gboolean
+icon_clicked (GtkWidget      *icon,
+              GdkEventButton *event,
+              WTApplet       *wtapplet)
 {
-       if (event->button != 1) return FALSE;
-
        WnckWindow *controlledwindow;
 
+       if (event->button != 1) return FALSE;
+
        if (wtapplet->prefs->only_maximized) {
                controlledwindow = wtapplet->umaxedwindow;
        } else {
@@ -546,9 +556,10 @@ static gboolean icon_clicked (GtkWidget *icon,
        return TRUE;
 }
 
-static gboolean title_clicked (GtkWidget *title,
-                               GdkEventButton *event,
-                               WTApplet *wtapplet)
+static gboolean
+title_clicked (GtkWidget      *title,
+               GdkEventButton *event,
+               WTApplet       *wtapplet)
 {
        // only allow left and right mouse button
        //if (event->button != 1 && event->button != 3) return FALSE;
@@ -580,8 +591,11 @@ static gboolean title_clicked (GtkWidget *title,
        } else if (event->button == 3) {
                // right-click
                if (wtapplet->prefs->show_window_menu) {
+                       GtkMenu *window_menu;
+
                        wnck_window_activate(controlledwindow, gtk_get_current_event_time());
-                       GtkMenu *window_menu = GTK_MENU(wnck_action_menu_new(controlledwindow));
+
+                       window_menu = GTK_MENU(wnck_action_menu_new(controlledwindow));
                        gtk_menu_popup(window_menu, NULL, NULL, NULL, NULL, event->button, 
gtk_get_current_event_time());
                        //TODO: somehow alter the panel action menu to also display the wnck_action_menu !
                } else {