Fix some compiler warnings.

(cherry picked from commit 082b747f9387ef3d8b1b725d41cd5a40604a389c)

2 files changed, 3 insertions, 19 deletions

diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c
index 842291a4..5c346dff 100644
--- a/xfce4-session/xfsm-chooser.c
+++ b/xfce4-session/xfsm-chooser.c
@@ -45,7 +45,6 @@
 #define BORDER 6
 
 
-static void xfsm_chooser_finalize      (GObject           *object);
 static void xfsm_chooser_row_activated (GtkTreeView       *treeview,
                                         GtkTreePath       *path,
                                         GtkTreeViewColumn *column,
@@ -131,10 +130,6 @@ xfsm_chooser_get_session (const XfsmChooser *chooser)
 static void
 xfsm_chooser_class_init (XfsmChooserClass *klass)
 {
-  GObjectClass *gobject_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = xfsm_chooser_finalize;
 }
 
 
@@ -218,17 +213,6 @@ xfsm_chooser_init (XfsmChooser *chooser)
 
 
 static void
-xfsm_chooser_finalize (GObject *object)
-{
-  XfsmChooser *chooser;
-
-  chooser = XFSM_CHOOSER (object);
-
-  G_OBJECT_CLASS (xfsm_chooser_parent_class)->finalize (object);
-}
-
-
-static void
 xfsm_chooser_row_activated (GtkTreeView       *treeview,
                             GtkTreePath       *path,
                             GtkTreeViewColumn *column,
diff --git a/xfce4-session/xfsm-client.c b/xfce4-session/xfsm-client.c
index f0821f4d..400bb5b1 100644
--- a/xfce4-session/xfsm-client.c
+++ b/xfce4-session/xfsm-client.c
@@ -336,19 +336,19 @@ xfsm_client_merge_properties (XfsmClient *client,
 
       prop = props[n];
 
-      if (!strcmp (props[n]->name, SmDiscardCommand))
+      if (!strcmp (prop->name, SmDiscardCommand))
         {
           old_discard = xfsm_properties_get_strv (properties, SmDiscardCommand);
           if (old_discard)
             old_discard = g_strdupv (old_discard);
         }
 
-      if (xfsm_properties_set_from_smprop (properties, props[n]))
+      if (xfsm_properties_set_from_smprop (properties, prop))
         {
           if (old_discard)
             xfsm_properties_discard_command_changed (properties, old_discard);
 
-          xfsm_client_signal_prop_change (client, props[n]->name);
+          xfsm_client_signal_prop_change (client, prop->name);
         }
 
       g_strfreev (old_discard);