[Xfce4-commits] r27278 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings xfce4-settings-helper xfce4-settings-manager

[Nick Schermer]

Author: nick
Date: 2008-07-13 18:36:34 +0000 (Sun, 13 Jul 2008)
New Revision: 27278

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/configure.ac.in
   xfce4-settings/trunk/dialogs/accessibility-settings/main.c
   xfce4-settings/trunk/dialogs/appearance-settings/main.c
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
   xfce4-settings/trunk/dialogs/mouse-settings/main.c
   xfce4-settings/trunk/xfce4-settings-helper/main.c
   xfce4-settings/trunk/xfce4-settings-manager/main.c
   xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
* xfce4-settings-manager/main.c: Add basic version information
  and gtk_init error. Destroy dialog after running it.
* xfce4-settings-manager/xfce-settings-manager-dialog.c: Free
  the icon string.
* dialogs/accessibility-settings/main.c, dialogs/mouse-settings/main.c,
  dialogs/appearance-settings/main.c, dialogs/keyboard-settings/main.c,
  xfce4-settings-helper/main.c: Don't include <stdio.h>. Duno why I did
  that.


Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/ChangeLog	2008-07-13 18:36:34 UTC (rev 27278)
@@ -1,10 +1,21 @@
 2008-07-13	Nick Schermer <nick at xfce.org>
 
+	* xfce4-settings-manager/main.c: Add basic version information
+	  and gtk_init error. Destroy dialog after running it.
+	* xfce4-settings-manager/xfce-settings-manager-dialog.c: Free
+	  the icon string.
+	* dialogs/accessibility-settings/main.c, dialogs/mouse-settings/main.c,
+	  dialogs/appearance-settings/main.c, dialogs/keyboard-settings/main.c,
+	  xfce4-settings-helper/main.c: Don't include <stdio.h>. Duno why I did
+	  that.
+
+2008-07-13	Nick Schermer <nick at xfce.org>
+
 	* dialogs/accessibility-settings/main.c,
 	  dialogs/mouse-settings/main.c,
 	  dialogs/appearance-settings/main.c,
 	  dialogs/keyboard-settings/main.c,
-	  xfce4-settings-helper/main.c: Add same ad improved error 
+	  xfce4-settings-helper/main.c: Add same and improved error 
 	  messages and version information.
 
 2008-07-13	Nick Schermer <nick at xfce.org>

Modified: xfce4-settings/trunk/configure.ac.in
===================================================================
--- xfce4-settings/trunk/configure.ac.in	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/configure.ac.in	2008-07-13 18:36:34 UTC (rev 27278)
@@ -60,7 +60,7 @@
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_CHECK_HEADERS([errno.h memory.h math.h stdlib.h stdio.h string.h unistd.h])
+AC_CHECK_HEADERS([errno.h memory.h math.h stdlib.h string.h unistd.h])
 
 dnl ******************************
 dnl *** Check for i18n support ***

Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/accessibility-settings/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -20,9 +20,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -21,9 +21,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -21,8 +21,12 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include <glib.h>
 #include <dbus/dbus-glib.h>

Modified: xfce4-settings/trunk/dialogs/mouse-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/dialogs/mouse-settings/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -20,9 +20,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -22,9 +22,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

Modified: xfce4-settings/trunk/xfce4-settings-manager/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-manager/main.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/xfce4-settings-manager/main.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -21,21 +21,54 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "xfce-settings-manager-dialog.h"
 
+static gboolean opt_version = FALSE;
+
+static GOptionEntry option_entries[] = {
+    { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, 
+      N_("Version information"), NULL },
+    { NULL }
+};
+
 int
 main(int argc,
      char **argv)
 {
     GtkWidget *dialog;
+    GError *error = NULL;
 
     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
 
-    gtk_init(&argc, &argv);
+    if(!gtk_init_with_args(&argc, &argv, "", option_entries, GETTEXT_PACKAGE, &error)) {
+        if(G_LIKELY(error)) {
+            g_print("xfce4-settings-manager: %s.\n", error->message);
+            g_print(_("Type '%s --help' for usage."), "xfce4-settings-manager");
+            g_print("\n");
 
+            g_error_free(error);
+        } else {
+            g_error("Unable to open display.");
+        }
+        return EXIT_FAILURE;
+    }
+
+    if (G_UNLIKELY (opt_version)) {
+        g_print("xfce4-settings-manager %s\n\n", PACKAGE_VERSION);
+        g_print("%s\n", "Copyright (c) 2008");
+        g_print("\t%s\n\n", _("The Xfce development team. All rights reserved."));
+        g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
+        g_print("\n");
+        return EXIT_SUCCESS;
+    }
+
     dialog = xfce_settings_manager_dialog_new();
     gtk_widget_show(dialog);
     g_signal_connect(G_OBJECT(dialog), "response",
@@ -43,5 +76,7 @@
 
     gtk_main();
 
-    return 0;
+    gtk_widget_destroy(dialog);
+
+    return EXIT_SUCCESS;
 }

Modified: xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c	2008-07-13 17:49:44 UTC (rev 27277)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c	2008-07-13 18:36:34 UTC (rev 27278)
@@ -263,6 +263,7 @@
             g_free(comment);
             g_free(exec);
             g_free(snotify);
+            g_free(icon);
             if(pix)
                 g_object_unref(G_OBJECT(pix));
             g_object_unref(G_OBJECT(dentry));