[Xfce4-commits] <xfce4-clipman-plugin:master> Shut down GCC warning messages

[Mike Massonnet]

Updating branch refs/heads/master
         to 0a278db4248f92652958e3b3a2597ad81157faaf (commit)
       from f10d6d586aaa62a53297d339e80b18f7d77d4e66 (commit)

commit 0a278db4248f92652958e3b3a2597ad81157faaf
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sat May 7 20:05:19 2011 +0200

    Shut down GCC warning messages
    
    -Wunused-but-set-variable
    -Wformat-extra-args

 daemon/gsd-clipboard-manager.c |   50 ----------------------------------------
 panel-plugin/plugin.c          |    4 +-
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/daemon/gsd-clipboard-manager.c b/daemon/gsd-clipboard-manager.c
index 62538fd..422cc65 100644
--- a/daemon/gsd-clipboard-manager.c
+++ b/daemon/gsd-clipboard-manager.c
@@ -351,49 +351,12 @@ gsd_clipboard_manager_stop (GsdClipboardManager *manager)
         }
 }
 
-static void
-gsd_clipboard_manager_set_property (GObject        *object,
-                                    guint           prop_id,
-                                    const GValue   *value,
-                                    GParamSpec     *pspec)
-{
-        GsdClipboardManager *self;
-
-        self = GSD_CLIPBOARD_MANAGER (object);
-
-        switch (prop_id) {
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
-static void
-gsd_clipboard_manager_get_property (GObject        *object,
-                                    guint           prop_id,
-                                    GValue         *value,
-                                    GParamSpec     *pspec)
-{
-        GsdClipboardManager *self;
-
-        self = GSD_CLIPBOARD_MANAGER (object);
-
-        switch (prop_id) {
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
 static GObject *
 gsd_clipboard_manager_constructor (GType                  type,
                                    guint                  n_construct_properties,
                                    GObjectConstructParam *construct_properties)
 {
         GsdClipboardManager      *clipboard_manager;
-        GsdClipboardManagerClass *klass;
-
-        klass = GSD_CLIPBOARD_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_CLIPBOARD_MANAGER));
 
         clipboard_manager = GSD_CLIPBOARD_MANAGER (G_OBJECT_CLASS (gsd_clipboard_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
@@ -403,24 +366,11 @@ gsd_clipboard_manager_constructor (GType                  type,
 }
 
 static void
-gsd_clipboard_manager_dispose (GObject *object)
-{
-        GsdClipboardManager *clipboard_manager;
-
-        clipboard_manager = GSD_CLIPBOARD_MANAGER (object);
-
-        G_OBJECT_CLASS (gsd_clipboard_manager_parent_class)->dispose (object);
-}
-
-static void
 gsd_clipboard_manager_class_init (GsdClipboardManagerClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_clipboard_manager_get_property;
-        object_class->set_property = gsd_clipboard_manager_set_property;
         object_class->constructor = gsd_clipboard_manager_constructor;
-        object_class->dispose = gsd_clipboard_manager_dispose;
         object_class->finalize = gsd_clipboard_manager_finalize;
 
         g_type_class_add_private (klass, sizeof (GsdClipboardManagerPrivate));
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 4b78ba8..fc025c2 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -333,8 +333,8 @@ plugin_configure (MyPlugin *plugin)
   if (error != NULL)
   {
     error_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-                                           _("Unable to open the settings dialog"), NULL);
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog), "%s", error->message, NULL);
+                                           _("Unable to open the settings dialog"));
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog), "%s", error->message);
     gtk_dialog_run (GTK_DIALOG (error_dialog));
     gtk_widget_destroy (error_dialog);
     g_error_free (error);