[Xfce4-commits] [xfce/xfwm4] 05/05: build: Fix warnings and errors

noreply at xfce.org noreply at xfce.org
Sat Mar 31 15:26:41 CEST 2018


This is an automated email from the git hooks/post-receive script.

o   l   i   v   i   e   r       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfwm4.

commit 5b834fa8f44422e6d41965e859b2e9cd4cd2863b
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sat Mar 31 15:25:15 2018 +0200

    build: Fix warnings and errors
    
    That would prevent building with --enable-debug=full
---
 settings-dialogs/range-debouncer.c |  5 +++--
 settings-dialogs/xfwm4-settings.c  | 40 ++++++++++++++++++++++++++++----------
 src/poswin.c                       |  4 ++--
 src/tabwin.c                       |  4 ++--
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/settings-dialogs/range-debouncer.c b/settings-dialogs/range-debouncer.c
index 571670b..a55e3f9 100644
--- a/settings-dialogs/range-debouncer.c
+++ b/settings-dialogs/range-debouncer.c
@@ -56,7 +56,8 @@ static void              range_debouncer_set_property                    (GObjec
                                                                           const GValue          *value,
                                                                           GParamSpec            *pspec);
 
-static void              range_debouncer_weak_notify                     (RangeDebouncer *range_debouncer);
+static void              range_debouncer_weak_notify                     (RangeDebouncer *range_debouncer,
+                                                                          GObject        *object);
 
 static void              range_debouncer_value_changed                   (RangeDebouncer *range_debouncer);
 static gboolean          range_debouncer_button_pressed                  (RangeDebouncer *range_debouncer);
@@ -197,7 +198,7 @@ range_debouncer_set_property (GObject      *object,
 
 
 static void
-range_debouncer_weak_notify (RangeDebouncer *range_debouncer)
+range_debouncer_weak_notify (RangeDebouncer *range_debouncer, GObject *object)
 {
   range_debouncer->range = NULL;
   g_object_unref (range_debouncer);
diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index 547e449..046bc86 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -82,8 +82,10 @@ enum
 
 
 
-static void       xfwm_settings_class_init                           (XfwmSettingsClass    *klass);
-static void       xfwm_settings_init                                 (XfwmSettings         *settings);
+static void       xfwm_settings_class_init                           (XfwmSettingsClass    *klass,
+                                                                      gpointer              data);
+static void       xfwm_settings_init                                 (XfwmSettings         *settings,
+                                                                      gpointer              data);
 static void       xfwm_settings_constructed                          (GObject              *object);
 static void       xfwm_settings_finalize                             (GObject              *object);
 static void       xfwm_settings_get_property                         (GObject              *object,
@@ -96,7 +98,8 @@ static void       xfwm_settings_set_property                         (GObject
                                                                       GParamSpec           *pspec);
 static gint       xfwm_settings_theme_sort_func                      (GtkTreeModel         *model,
                                                                       GtkTreeIter          *iter1,
-                                                                      GtkTreeIter          *iter2);
+                                                                      GtkTreeIter          *iter2,
+                                                                      gpointer              data);
 static void       xfwm_settings_load_themes                          (XfwmSettings         *settings);
 static void       xfwm_settings_theme_selection_changed              (GtkTreeSelection     *selection,
                                                                       XfwmSettings         *settings);
@@ -275,7 +278,7 @@ xfwm_settings_get_type (void)
 
 
 static void
-xfwm_settings_class_init (XfwmSettingsClass *klass)
+xfwm_settings_class_init (XfwmSettingsClass *klass, gpointer data)
 {
   GObjectClass *gobject_class;
 
@@ -303,7 +306,7 @@ xfwm_settings_class_init (XfwmSettingsClass *klass)
 
 
 static void
-xfwm_settings_init (XfwmSettings *settings)
+xfwm_settings_init (XfwmSettings *settings, gpointer data)
 {
   settings->priv = XFWM_SETTINGS_GET_PRIVATE (settings);
 
@@ -739,7 +742,8 @@ xfwm_settings_new (void)
 static gint
 xfwm_settings_theme_sort_func (GtkTreeModel *model,
                                GtkTreeIter  *iter1,
-                               GtkTreeIter  *iter2)
+                               GtkTreeIter  *iter2,
+                               gpointer      data)
 {
   gchar *str1 = NULL;
   gchar *str2 = NULL;
@@ -1790,6 +1794,22 @@ xfwm_settings_shortcut_removed (XfceShortcutsProvider *provider,
 
 
 static void
+free_row (GtkTreeRowReference *reference, gpointer unused)
+{
+  gtk_tree_row_reference_free (reference);
+}
+
+
+
+static void
+free_path (GtkTreePath *path, gpointer unused)
+{
+  gtk_tree_path_free (path);
+}
+
+
+
+static void
 xfwm_settings_shortcut_edit_clicked (GtkButton    *button,
                                      XfwmSettings *settings)
 {
@@ -1828,11 +1848,11 @@ xfwm_settings_shortcut_edit_clicked (GtkButton    *button,
     }
 
   /* Free row reference list */
-  g_list_foreach (row_references, (GFunc) gtk_tree_row_reference_free, NULL);
+  g_list_foreach (row_references, (GFunc) free_row, NULL);
   g_list_free (row_references);
 
   /* Free row list */
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+  g_list_foreach (rows, (GFunc) free_path, NULL);
   g_list_free (rows);
 }
 
@@ -1896,11 +1916,11 @@ xfwm_settings_shortcut_clear_clicked (GtkButton    *button,
     }
 
   /* Free row reference list */
-  g_list_foreach (row_references, (GFunc) gtk_tree_row_reference_free, NULL);
+  g_list_foreach (row_references, (GFunc) free_row, NULL);
   g_list_free (row_references);
 
   /* Free row list */
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+  g_list_foreach (rows, (GFunc) free_path, NULL);
   g_list_free (rows);
 }
 
diff --git a/src/poswin.c b/src/poswin.c
index 79f3816..064eea6 100644
--- a/src/poswin.c
+++ b/src/poswin.c
@@ -34,7 +34,7 @@
 #include "frame.h"
 #include "poswin.h"
 
-static void poswin_widget_class_init (PoswinWidgetClass *klass);
+static void poswin_widget_class_init (PoswinWidgetClass *klass, gpointer data);
 
 static GType
 poswin_widget_get_type (void)
@@ -64,7 +64,7 @@ poswin_widget_get_type (void)
 }
 
 static void
-poswin_widget_class_init (PoswinWidgetClass *klass)
+poswin_widget_class_init (PoswinWidgetClass *klass, gpointer class_data)
 {
     /* void */
 }
diff --git a/src/tabwin.c b/src/tabwin.c
index 43d7957..4be61fb 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -68,7 +68,7 @@ static const gchar *xfwm_tabwin_default_css =
 "  background-color: @theme_bg_color;"
 "}";
 
-static void tabwin_widget_class_init (TabwinWidgetClass *klass);
+static void tabwin_widget_class_init (TabwinWidgetClass *klass, gpointer data);
 
 static GType
 tabwin_widget_get_type (void)
@@ -585,7 +585,7 @@ tabwinConfigure (TabwinWidget *tabwin_widget, GdkEventConfigure *event)
 }
 
 static void
-tabwin_widget_class_init (TabwinWidgetClass *klass)
+tabwin_widget_class_init (TabwinWidgetClass *klass, gpointer data)
 {
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list