[Xfce4-commits] r27189 - in xfce4-settings/trunk: . dialogs/mouse-settings

[Nick Schermer]

Author: nick
Date: 2008-07-01 19:46:42 +0000 (Tue, 01 Jul 2008)
New Revision: 27189

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
   xfce4-settings/trunk/dialogs/mouse-settings/main.c
Log:
	* dialogs/mouse-settings/main.c: Destroy the dialog on exit
	  and Xfce4-mouse-settings in the version information.
	* dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN
	  for glib warnings, errors and messages in the code.

Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog	2008-07-01 13:19:35 UTC (rev 27188)
+++ xfce4-settings/trunk/ChangeLog	2008-07-01 19:46:42 UTC (rev 27189)
@@ -1,3 +1,10 @@
+2008-07-01	Nick Schermer <nick"xfce.org>
+
+	* dialogs/mouse-settings/main.c: Destroy the dialog on exit
+	  and Xfce4-mouse-settings in the version information.
+	* dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN
+	  for glib warnings, errors and messages in the code.
+
 2008-06-29	Jannis Pohlmann <jannis at xfce.org>
 
 	* xfce4-settings-manager/xfce-settings-manager-dialog.c: 

Modified: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am	2008-07-01 13:19:35 UTC (rev 27188)
+++ xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am	2008-07-01 19:46:42 UTC (rev 27189)
@@ -23,7 +23,8 @@
 	$(XFCONF_LIBS)
 
 INCLUDES = \
-	-I${top_srcdir}
+	-I${top_srcdir} \
+	-DG_LOG_DOMAIN=\"Xfce4-mouse-settings\"
 
 if MAINTAINER_MODE
 

Modified: xfce4-settings/trunk/dialogs/mouse-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/main.c	2008-07-01 13:19:35 UTC (rev 27188)
+++ xfce4-settings/trunk/dialogs/mouse-settings/main.c	2008-07-01 19:46:42 UTC (rev 27189)
@@ -537,7 +537,7 @@
     /* print version information */
     if (G_UNLIKELY (opt_version))
     {
-        g_print ("%s %s (Xfce %s)\n\n", PACKAGE_NAME, PACKAGE_VERSION, xfce_version_string ());
+        g_print ("Xfce4-mouse-settings %s (Xfce %s)\n\n", PACKAGE_VERSION, xfce_version_string ());
         g_print ("%s\n", "Copyright (c) 2004-2008");
         g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
         g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
@@ -565,6 +565,9 @@
 
             /* release the glade xml */
             g_object_unref (G_OBJECT (gxml));
+
+            /* destroy the dialog */
+            gtk_widget_destroy (dialog);
         }
 
         /* release the channel */