Merge lp:~jassmith/desktop-switcher/no-maximize into lp:desktop-switcher

[Jason Smith]

[Jason Smith (jassmith)]

fixes bug #367660.

[David Barth (dbarth)]

The code seems ok, but i'd like Neil to confirm it's the only thing required to fix this bug.

review: Abstain

[Neil J. Patel (njpatel)]

Looks good, as per bug. Approved.

review: Approve

=== modified file 'src/main.c'
--- src/main.c	2009-08-17 11:14:08 +0000
+++ src/main.c	2009-09-01 10:00:21 +0000
@@ -52,6 +52,7 @@
 #define NAUTILUS_SHOW_DESKTOP "/apps/nautilus/preferences/show_desktop"
 #define THEME "/desktop/gnome/interface/gtk_theme"
 #define MAXIMUS "/apps/maximus/undecorate"
+#define MAXIMUS_NO_MAXIMIZE "/apps/maximus/no_maximize"
 
 #define GCONF_STOP  "gconftool-2 --shutdown"
 #define GCONF_UNSET "gconftool-2 --recursive-unset /apps/panel"
@@ -394,6 +395,17 @@
     g_error_free (error);
     error = NULL;
   }
+  
+  /* Set maximus no_maximize */
+  error = NULL;
+  gconf_client_set_bool (client, MAXIMUS_NO_MAXIMIZE, FALSE, &error);
+  if (error)
+  {
+    g_warning ("Can't change Maximus's no maximize setting: %s", 
+               error->message);
+    g_error_free (error);
+    error = NULL;
+  }
 
   /* Launch the launcher */
   g_debug ("Launching the, er, Launcher");
@@ -511,6 +523,17 @@
     g_error_free (error);
     error = NULL;
   }
+  
+  /* Set maximus no_maximize */
+  error = NULL;
+  gconf_client_set_bool (client, MAXIMUS_NO_MAXIMIZE, TRUE, &error);
+  if (error)
+  {
+    g_warning ("Can't change Maximus's no maximize setting: %s", 
+               error->message);
+    g_error_free (error);
+    error = NULL;
+  }
 
   /* Kill any version of the launcher. */
   g_debug ("Killing the launcher");