[Xfce4-commits] <xfce4-notes-plugin:master> Fix compile warnings from .c files

[Mike Massonnet]

Updating branch refs/heads/master
         to eafe114fa8a80f9c976c83cccaf6a27ef754bbb0 (commit)
       from 0877230c9e3f04ef216c3ef783ad614f86e7b1d2 (commit)

commit eafe114fa8a80f9c976c83cccaf6a27ef754bbb0
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sat Dec 19 12:21:09 2009 +0100

    Fix compile warnings from .c files

 ChangeLog                           |    4 ++++
 panel-plugin/xfce4-notes-settings.c |   21 +++++++++++----------
 panel-plugin/xfce4-popup-notes.c    |    5 +----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7e8081..435366d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-19  Mike Massonnet <mmassonnet at xfce.org>
 
+Fix compile warnings from .c files
+
+2009-12-19  Mike Massonnet <mmassonnet at xfce.org>
+
 Damn I forgot the return in the GTimeout operation
 
 2009-12-19  Mike Massonnet <mmassonnet at xfce.org>
diff --git a/panel-plugin/xfce4-notes-settings.c b/panel-plugin/xfce4-notes-settings.c
index 863b7d5..3aaa6fd 100644
--- a/panel-plugin/xfce4-notes-settings.c
+++ b/panel-plugin/xfce4-notes-settings.c
@@ -79,8 +79,8 @@ static XfconfChannel *xfconf_channel = NULL;
 static GtkWidget *color_combobox = NULL;
 static GtkWidget *color_button = NULL;
 
-GtkWidget *
-prop_dialog_new ()
+static GtkWidget *
+prop_dialog_new (void)
 {
   GtkWidget *dialog, *notebook, *vbox, *frame, *box, *hbox, *button, *label;
 
@@ -203,7 +203,7 @@ prop_dialog_new ()
 }
 
 static GtkWidget *
-tabs_combo_box_new ()
+tabs_combo_box_new (void)
 {
   GtkWidget *combobox;
 
@@ -222,7 +222,7 @@ tabs_combo_box_new ()
 }
 
 static GtkWidget *
-size_combo_box_new ()
+size_combo_box_new (void)
 {
   GtkWidget *combobox;
   gint size;
@@ -281,7 +281,7 @@ cb_size_combobox_changed (GtkComboBox *combobox,
 }
 
 static GtkWidget *
-background_combo_box_new ()
+background_combo_box_new (void)
 {
   GtkWidget *combobox;
   gchar *color;
@@ -401,7 +401,7 @@ timeout_cb_background_changed (gchar *color)
 }
 
 static GtkWidget *
-background_dialog_new ()
+background_dialog_new (void)
 {
   GtkWidget *dialog;
   GtkWidget *selection;
@@ -451,7 +451,7 @@ cb_selection_changed (GtkColorSelection *selection,
 }
 
 static GtkWidget *
-color_button_new ()
+color_button_new (void)
 {
   GtkWidget *button;
   GdkColor gdkcolor;
@@ -508,19 +508,20 @@ cb_unique_app (UniqueApp *app,
 }
 
 gint main (gint argc,
-          gchar *argv[])
+           gchar *argv[])
 {
   GtkWidget *dialog;
+  UniqueApp *app;
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, NULL);
   xfconf_init (NULL);
   gtk_init (&argc, &argv);
-  UniqueApp *app = unique_app_new ("org.xfce.NotesSettings", NULL);
+  app = unique_app_new ("org.xfce.NotesSettings", NULL);
   if (unique_app_is_running (app))
     {
       if (unique_app_send_message (app, UNIQUE_ACTIVATE, NULL) == UNIQUE_RESPONSE_OK)
         {
           g_object_unref (app);
-          return;
+          return 0;
         }
     }
   dialog = prop_dialog_new ();
diff --git a/panel-plugin/xfce4-popup-notes.c b/panel-plugin/xfce4-popup-notes.c
index ba9616c..da28d42 100644
--- a/panel-plugin/xfce4-popup-notes.c
+++ b/panel-plugin/xfce4-popup-notes.c
@@ -57,7 +57,6 @@ main (gint argc, gchar *argv[])
   GdkEventClient        gev;
   GtkWidget            *win;
   Window                id;
-  gchar                *message = NULL;
 
   gboolean              opt_show_hide = FALSE;
   GError               *opt_error = NULL;
@@ -80,8 +79,6 @@ main (gint argc, gchar *argv[])
       return -1;
     }
 
-  message = g_strdup_printf (NOTES_MSG_SHOW_HIDE);
-
   gtk_init (&argc, &argv);
 
   win = gtk_invisible_new ();
@@ -92,7 +89,7 @@ main (gint argc, gchar *argv[])
   gev.send_event        = TRUE;
   gev.message_type      = gdk_atom_intern ("STRING", FALSE);
   gev.data_format       = 8;
-  g_snprintf (gev.data.b, sizeof (gev.data.b), message);
+  g_snprintf (gev.data.b, sizeof (gev.data.b), NOTES_MSG_SHOW_HIDE);
 
   if (notes_plugin_check_is_running (win, &id))
     gdk_event_send_client_message ((GdkEvent *)&gev, (GdkNativeWindow)id);