[Xfce4-commits] <xfce4-settings:master> Fix compiler warnings.

[Nick Schermer]

Updating branch refs/heads/master
         to 705c08ea7345ca27005c59e03de95a10c9d08da8 (commit)
       from 5572eb6f3cc317070be452b2dcd8373bcf5053b9 (commit)

commit 705c08ea7345ca27005c59e03de95a10c9d08da8
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 16 19:43:05 2010 +0100

    Fix compiler warnings.

 xfce4-settings-helper/accessibility.c   |    2 +-
 xfce4-settings-helper/displays.c        |   16 ++--------------
 xfce4-settings-helper/keyboard-layout.c |   13 ++-----------
 xfce4-settings-helper/pointers.c        |   14 --------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/xfce4-settings-helper/accessibility.c b/xfce4-settings-helper/accessibility.c
index df46348..0f2f48d 100644
--- a/xfce4-settings-helper/accessibility.c
+++ b/xfce4-settings-helper/accessibility.c
@@ -153,9 +153,9 @@ xfce_accessibility_helper_init (XfceAccessibilityHelper *helper)
 static void
 xfce_accessibility_helper_finalize (GObject *object)
 {
+#ifdef HAVE_LIBNOTIFY
     XfceAccessibilityHelper *helper = XFCE_ACCESSIBILITY_HELPER (object);
 
-#ifdef HAVE_LIBNOTIFY
     /* close an opened notification */
     if (G_UNLIKELY (helper->notification))
         notify_notification_close (helper->notification, NULL);
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 90783d8..7a7ea80 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -43,7 +43,8 @@
 #undef HAS_RANDR_ONE_POINT_THREE
 #endif
 
-static void            xfce_displays_helper_finalize                       (GObject                 *object);
+
+
 static void            xfce_displays_helper_channel_apply                  (XfceDisplaysHelper      *helper,
                                                                             const gchar             *scheme);
 static void            xfce_displays_helper_channel_property_changed       (XfconfChannel           *channel,
@@ -105,10 +106,7 @@ G_DEFINE_TYPE (XfceDisplaysHelper, xfce_displays_helper, G_TYPE_OBJECT);
 static void
 xfce_displays_helper_class_init (XfceDisplaysHelperClass *klass)
 {
-    GObjectClass *gobject_class;
 
-    gobject_class = G_OBJECT_CLASS (klass);
-    gobject_class->finalize = xfce_displays_helper_finalize;
 }
 
 
@@ -159,16 +157,6 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
 
 
 static void
-xfce_displays_helper_finalize (GObject *object)
-{
-    XfceDisplaysHelper *helper = XFCE_DISPLAYS_HELPER (object);
-
-    (*G_OBJECT_CLASS (xfce_displays_helper_parent_class)->finalize) (object);
-}
-
-
-
-static void
 xfce_displays_helper_process_screen_size (gint  mode_width,
                                           gint  mode_height,
                                           gint  crtc_pos_x,
diff --git a/xfce4-settings-helper/keyboard-layout.c b/xfce4-settings-helper/keyboard-layout.c
index 3d7d3df..21dbb49 100644
--- a/xfce4-settings-helper/keyboard-layout.c
+++ b/xfce4-settings-helper/keyboard-layout.c
@@ -44,7 +44,6 @@
 
 #include "keyboard-layout.h"
 
-static void xfce_keyboard_layout_helper_finalize                  (GObject                       *object);
 static void xfce_keyboard_layout_helper_process_xmodmap           (void);
 static void xfce_keyboard_layout_helper_set_model                 (XfceKeyboardLayoutHelper      *helper);
 static void xfce_keyboard_layout_helper_set_layout                (XfceKeyboardLayoutHelper      *helper);
@@ -65,7 +64,8 @@ struct _XfceKeyboardLayoutHelper
 
     /* xfconf channel */
     XfconfChannel     *channel;
-    gboolean xkb_disable_settings;
+
+    gboolean           xkb_disable_settings;
 
 #ifdef HAVE_LIBXKLAVIER
     /* libxklavier */
@@ -80,10 +80,7 @@ G_DEFINE_TYPE (XfceKeyboardLayoutHelper, xfce_keyboard_layout_helper, G_TYPE_OBJ
 static void
 xfce_keyboard_layout_helper_class_init (XfceKeyboardLayoutHelperClass *klass)
 {
-    GObjectClass *gobject_class;
 
-    gobject_class = G_OBJECT_CLASS (klass);
-    gobject_class->finalize = xfce_keyboard_layout_helper_finalize;
 }
 
 static void
@@ -113,13 +110,7 @@ xfce_keyboard_layout_helper_init (XfceKeyboardLayoutHelper *helper)
     xfce_keyboard_layout_helper_process_xmodmap ();
 }
 
-static void
-xfce_keyboard_layout_helper_finalize (GObject *object)
-{
-    XfceKeyboardLayoutHelper *helper = XFCE_KEYBOARD_LAYOUT_HELPER (object);
 
-    (*G_OBJECT_CLASS (xfce_keyboard_layout_helper_parent_class)->finalize) (object);
-}
 
 static void
 xfce_keyboard_layout_helper_process_xmodmap (void)
diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c
index a67be7d..a1a352d 100644
--- a/xfce4-settings-helper/pointers.c
+++ b/xfce4-settings-helper/pointers.c
@@ -58,7 +58,6 @@
 
 
 
-static void             xfce_pointers_helper_finalize                       (GObject                 *object);
 static void             xfce_pointers_helper_change_button_mapping_swap     (guchar                  *buttonmap,
                                                                              gshort                   num_buttons,
                                                                              gint                     id_1,
@@ -116,10 +115,7 @@ G_DEFINE_TYPE (XfcePointersHelper, xfce_pointers_helper, G_TYPE_OBJECT);
 static void
 xfce_pointers_helper_class_init (XfcePointersHelperClass *klass)
 {
-    GObjectClass *gobject_class;
 
-    gobject_class = G_OBJECT_CLASS (klass);
-    gobject_class->finalize = xfce_pointers_helper_finalize;
 }
 
 
@@ -189,16 +185,6 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
 
 
 static void
-xfce_pointers_helper_finalize (GObject *object)
-{
-    XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object);
-
-    (*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)->finalize) (object);
-}
-
-
-
-static void
 xfce_pointers_helper_change_button_mapping_swap (guchar   *buttonmap,
                                                  gshort    num_buttons,
                                                  gint      id_1,