[gnome-panel/wip-warnings-next: 4/20] multiscreen: make panel_multiscreen_reinit static



commit bfc606bc6d5d483a62b696a8f3567d9b2bddf42d
Author: Sebastian Geiger <sbastig gmx net>
Date:   Tue Feb 25 10:33:55 2020 +0100

    multiscreen: make panel_multiscreen_reinit static

 gnome-panel/panel-multiscreen.c | 53 ++++++++++++++++++++++-------------------
 gnome-panel/panel-multiscreen.h |  1 -
 2 files changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
index be815088e..7a55cb6bd 100644
--- a/gnome-panel/panel-multiscreen.c
+++ b/gnome-panel/panel-multiscreen.c
@@ -41,6 +41,8 @@ static gboolean       have_randr  = FALSE;
 static gboolean       have_randr_1_3 = FALSE;
 static guint          reinit_id   = 0;
 
+static void  panel_multiscreen_queue_reinit (void);
+
 static gboolean
 _panel_multiscreen_output_should_be_first (Display       *xdisplay,
                                           RROutput       output,
@@ -372,6 +374,33 @@ panel_multiscreen_get_monitors_for_screen (int           *monitors_ret,
                                                         geometries_ret);
 }
 
+static void
+panel_multiscreen_reinit (void)
+{
+  GdkScreen *screen;
+  GList     *toplevels, *toplevel;
+
+  if (geometries)
+    {
+      g_free (geometries);
+    }
+
+  screen = gdk_screen_get_default ();
+
+  g_signal_handlers_disconnect_by_func (screen, panel_multiscreen_queue_reinit,
+                                        NULL);
+
+  initialized = FALSE;
+  panel_multiscreen_init ();
+
+  toplevels = gtk_window_list_toplevels ();
+
+  for (toplevel = toplevels; toplevel; toplevel = toplevel->next)
+    gtk_widget_queue_resize (toplevel->data);
+
+  g_list_free (toplevels);
+}
+
 static gboolean
 panel_multiscreen_reinit_idle (gpointer data)
 {
@@ -446,30 +475,6 @@ panel_multiscreen_init (void)
        initialized = TRUE;
 }
 
-void
-panel_multiscreen_reinit (void)
-{
-       GdkScreen *screen;
-       GList     *toplevels, *l;
-
-       if (geometries) {
-               g_free (geometries);
-       }
-
-       screen = gdk_screen_get_default ();
-       g_signal_handlers_disconnect_by_func (screen, panel_multiscreen_queue_reinit, NULL);
-
-       initialized = FALSE;
-       panel_multiscreen_init ();
-
-       toplevels = gtk_window_list_toplevels ();
-
-       for (l = toplevels; l; l = l->next)
-               gtk_widget_queue_resize (l->data);
-
-       g_list_free (toplevels);
-}
-
 int
 panel_multiscreen_x (GdkScreen *screen,
                     int        monitor)
diff --git a/gnome-panel/panel-multiscreen.h b/gnome-panel/panel-multiscreen.h
index 9876cdbfd..2e97ae21c 100644
--- a/gnome-panel/panel-multiscreen.h
+++ b/gnome-panel/panel-multiscreen.h
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 void   panel_multiscreen_init                  (void);
-void   panel_multiscreen_reinit                (void);
 
 int    panel_multiscreen_x                     (GdkScreen *screen,
                                                 int        monitor);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]