Enable maximum warnings.

A bunch of compile fixes.

6 files changed, 7 insertions, 57 deletions

diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index ef91efe..5cc58d1 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
@@ -14,6 +14,7 @@ pkgpyexecdir = $(pythondir)/sugar
 pkgpyexec_LTLIBRARIES = _sugarext.la
 
 _sugarext_la_CFLAGS = 		\
+        $(WARN_CFLAGS)		\
 	$(EXT_CFLAGS)		\
 	$(PYTHON_INCLUDES)
 
diff --git a/src/sugar/_sugarext.override b/src/sugar/_sugarext.override
index db49e27..dc54de0 100644
--- a/src/sugar/_sugarext.override
+++ b/src/sugar/_sugarext.override
@@ -10,8 +10,8 @@ headers
 #include "sugar-preview.h"
 #include "sexy-icon-entry.h"
 #include "gsm-session.h"
+#include "gsm-xsmp.h"
 
-#define EGG_SM_CLIENT_BACKEND_XSMP
 #include "eggsmclient.h"
 #include "eggsmclient-private.h"
 
diff --git a/src/sugar/eggsmclient-private.h b/src/sugar/eggsmclient-private.h
index 0b4ec40..d2958c9 100644
--- a/src/sugar/eggsmclient-private.h
+++ b/src/sugar/eggsmclient-private.h
@@ -25,6 +25,8 @@
 
 G_BEGIN_DECLS
 
+#define EGG_SM_CLIENT_BACKEND_XSMP
+
 GKeyFile *egg_sm_client_save_state     (EggSMClient *client);
 void      egg_sm_client_quit_requested (EggSMClient *client);
 void      egg_sm_client_quit_cancelled (EggSMClient *client);
diff --git a/src/sugar/gsm-session.c b/src/sugar/gsm-session.c
index 95dd7cb..3f0714c 100644
--- a/src/sugar/gsm-session.c
+++ b/src/sugar/gsm-session.c
@@ -151,53 +151,6 @@ end_phase (GsmSession *session)
 }
 
 static void
-app_condition_changed (GsmApp *app, gboolean condition, gpointer data)
-{
-  GsmSession *session;
-  GsmClient *client = NULL;
-  GSList *cl = NULL;
-
-  g_return_if_fail (data != NULL);
-
-  session = (GsmSession *) data;
-
-  /* Check for an existing session client for this app */
-  for (cl = session->clients; cl; cl = cl->next)
-    {
-      GsmClient *c = GSM_CLIENT (cl->data);
-
-      if (!strcmp (app->client_id, gsm_client_get_client_id (c)))
-        client = c;
-    }
-
-  if (condition)
-    {
-      GError *error = NULL;
-
-      if (app->pid <= 0 && client == NULL)
-        gsm_app_launch (app, &error);
-
-      if (error != NULL)
-        {
-          g_warning ("Not able to launch autostart app from its condition: %s",
-                     error->message);
-
-          g_error_free (error);
-        }
-    }
-  else
-    {
-      /* Kill client in case condition if false and make sure it won't
-       * be automatically restarted by adding the client to 
-       * condition_clients */
-      session->condition_clients =
-            g_slist_prepend (session->condition_clients, client);
-      gsm_client_die (client);
-      app->pid = -1; 
-    }
-}
-
-static void
 app_registered (GsmApp *app, gpointer data)
 {
   GsmSession *session = data;
@@ -241,10 +194,6 @@ phase_timeout (gpointer data)
 static void
 start_phase (GsmSession *session)
 {
-  GsmApp *app;
-  GSList *a;
-  GError *err = NULL;
-
   g_debug ("starting phase %d\n", session->phase);
 
   g_slist_free (session->pending_apps);
@@ -359,8 +308,6 @@ client_saved_state (GsmClient *client, gpointer data)
 void
 gsm_session_initiate_shutdown (GsmSession *session)
 {
-  gboolean logout_prompt;
-
   if (session->phase == GSM_SESSION_PHASE_SHUTDOWN)
     {
       /* Already shutting down, nothing more to do */
diff --git a/src/sugar/sugar-menu.h b/src/sugar/sugar-menu.h
index 8773a31..74ce891 100644
--- a/src/sugar/sugar-menu.h
+++ b/src/sugar/sugar-menu.h
@@ -50,6 +50,7 @@ void     sugar_menu_set_active (SugarMenu    *menu,
                                 gboolean      active);
 void     sugar_menu_embed      (SugarMenu    *menu,
                                 GtkContainer *parent);
+void     sugar_menu_unembed    (SugarMenu    *menu);
 
 G_END_DECLS
 
diff --git a/src/sugar/sugar-preview.c b/src/sugar/sugar-preview.c
index f54045b..42fb9d3 100644
--- a/src/sugar/sugar-preview.c
+++ b/src/sugar/sugar-preview.c
@@ -19,6 +19,7 @@
 
 #include <gdk/gdkx.h>
 #include <gtk/gtkwindow.h>
+#include <X11/extensions/XShm.h>
 
 #include "sugar-preview.h"
 
@@ -37,8 +38,6 @@ sugar_preview_set_size(SugarPreview *preview, int width, int height)
 GdkPixbuf *
 sugar_preview_get_pixbuf(SugarPreview *preview)
 {
-    GdkPixbuf *pixbuf;
-
     if (preview->pixbuf != NULL) {
         return preview->pixbuf;
     }
@@ -92,7 +91,7 @@ sugar_preview_take_screenshot(SugarPreview *preview, GdkDrawable *drawable)
     XShmGetImage(GDK_SCREEN_XDISPLAY(screen),
                  GDK_DRAWABLE_XID(drawable),
                  gdk_x11_image_get_ximage(preview->image),
-                 0, 0, AllPlanes, ZPixmap);
+                 0, 0, AllPlanes);
 }
 
 static void