gnome-session r4961 - in trunk: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Fri Aug 15 22:06:22 2008
New Revision: 4961
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4961&view=rev

Log:
2008-08-15  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-inhibit-dialog.c (add_inhibitor),
	(gsm_inhibit_dialog_constructor):
	Try again with fewer warnings this time.



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-inhibit-dialog.c

Modified: trunk/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.c	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.c	Fri Aug 15 22:06:22 2008
@@ -510,7 +510,6 @@
                 desktop_filename = g_strdup (app_id);
         }
 
-#if 0
         xid = gsm_inhibitor_peek_toplevel_xid (inhibitor);
         g_debug ("GsmInhibitDialog: inhibitor has XID %u", xid);
         if (xid > 0 && dialog->priv->have_xrender) {
@@ -519,7 +518,6 @@
                         g_debug ("GsmInhibitDialog: unable to read pixbuf from %u", xid);
                 }
         }
-#endif
 
         if (desktop_filename != NULL) {
                 /* FIXME: maybe also append the autostart dirs ? */
@@ -567,7 +565,7 @@
                 client_id = gsm_inhibitor_peek_client_id (inhibitor);
                 if (! IS_STRING_EMPTY (client_id)) {
                         GsmClient *client;
-                        client = gsm_store_lookup (dialog->priv->clients, client_id);
+                        client = (GsmClient *)gsm_store_lookup (dialog->priv->clients, client_id);
                         if (client != NULL) {
                                 freeme = name = gsm_client_get_app_name (client);
                         }
@@ -960,6 +958,9 @@
         gdk_error_trap_pop ();
 #endif /* HAVE_XRENDER */
 
+        /* FIXME: turn this on when it is ready */
+        dialog->priv->have_xrender = FALSE;
+
         setup_dialog (dialog);
 
         gtk_widget_show_all (GTK_WIDGET (dialog));