gnome-control-center r9096 - in trunk: capplets/windows libwindow-settings

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 20:57:16 2008
New Revision: 9096
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9096&view=rev

Log:
+Fri Oct 24 16:56:50 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* gnome-window-properties.c: Use gtk_init() instead of
+	gnome_program_init().
+
+Fri Oct 24 16:56:23 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* gnome-wm-manager.c (gnome_wm_manager_init): Use correct path for
+	window manager properties
+



Modified:
   trunk/capplets/windows/ChangeLog
   trunk/capplets/windows/gnome-window-properties.c
   trunk/libwindow-settings/ChangeLog
   trunk/libwindow-settings/gnome-wm-manager.c

Modified: trunk/capplets/windows/gnome-window-properties.c
==============================================================================
--- trunk/capplets/windows/gnome-window-properties.c	(original)
+++ trunk/capplets/windows/gnome-window-properties.c	Fri Oct 24 20:57:16 2008
@@ -27,6 +27,9 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+#include <glib/gi18n.h>
+#include <string.h>
 #include <glade/glade.h>
 #include <gnome-wm-manager.h>
 
@@ -373,7 +376,6 @@
 int
 main (int argc, char **argv)
 {
-	GnomeProgram *program;
         GdkScreen *screen;
 	GnomeWMSettings new_settings;
 	int rc = 0;
@@ -383,9 +385,7 @@
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
 
-  	program = gnome_program_init ("gnome-window-properties", VERSION,
-				      LIBGNOMEUI_MODULE, argc, argv,
-				      NULL);
+        gtk_init (&argc, &argv);
 
         gnome_wm_manager_init ();
 
@@ -474,7 +474,6 @@
 	g_object_unref (dialog);
 
 out:
-	g_object_unref (program);
         return rc;
 }
 

Modified: trunk/libwindow-settings/gnome-wm-manager.c
==============================================================================
--- trunk/libwindow-settings/gnome-wm-manager.c	(original)
+++ trunk/libwindow-settings/gnome-wm-manager.c	Fri Oct 24 20:57:16 2008
@@ -223,7 +223,7 @@
 
         done_scan = TRUE;
         
-        tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, "gnome", "wm-properties", NULL);
+        tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, NULL);
         scan_wm_directory (tempdir, FALSE);
         g_free (tempdir);