GNOME.org
 

gnome-session r4964 - in trunk: . capplet egg gnome-session tools

Author: kmaraas
Date: Sat Aug 16 09:55:37 2008
New Revision: 4964
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4964&view=rev

Log:
2008-08-16  Kjartan Maraas  <kmaraas gnome org>

	* capplet/gsm-app-dialog.c:
	* egg/eggdesktopfile.h:
	* egg/eggsmclient-libgnomeui.c: (egg_sm_client_module_info_get):
	* egg/eggsmclient-xsmp.c:
	* gnome-session/gsm-autostart-app.c:
	* gnome-session/gsm-client.c:
	* gnome-session/gsm-client.h:
	* gnome-session/gsm-dbus-client.c:
	* gnome-session/gsm-inhibit-dialog.c: (add_inhibitor):
	* gnome-session/gsm-inhibit-dialog.h:
	* gnome-session/gsm-inhibitor.c:
	* gnome-session/gsm-inhibitor.h:
	* gnome-session/gsm-manager.c:
	* gnome-session/gsm-store.c:
	* gnome-session/gsm-util.c:
	* gnome-session/gsm-xsmp-client.c:
	* gnome-session/gsm-xsmp-server.c:
	* gnome-session/test-inhibit.c:
	* tools/gnome-session-save.c:
	Fix some warnings from sparse and other tools. Closes
	bug #521413

Modified:
   trunk/ChangeLog
   trunk/capplet/gsm-app-dialog.c
   trunk/egg/eggdesktopfile.h
   trunk/egg/eggsmclient-libgnomeui.c
   trunk/egg/eggsmclient-xsmp.c
   trunk/gnome-session/gsm-autostart-app.c
   trunk/gnome-session/gsm-client.c
   trunk/gnome-session/gsm-client.h
   trunk/gnome-session/gsm-dbus-client.c
   trunk/gnome-session/gsm-inhibit-dialog.c
   trunk/gnome-session/gsm-inhibit-dialog.h
   trunk/gnome-session/gsm-inhibitor.c
   trunk/gnome-session/gsm-inhibitor.h
   trunk/gnome-session/gsm-manager.c
   trunk/gnome-session/gsm-store.c
   trunk/gnome-session/gsm-util.c
   trunk/gnome-session/gsm-xsmp-client.c
   trunk/gnome-session/gsm-xsmp-server.c
   trunk/gnome-session/test-inhibit.c
   trunk/tools/gnome-session-save.c

Modified: trunk/capplet/gsm-app-dialog.c
==============================================================================
--- trunk/capplet/gsm-app-dialog.c	(original)
+++ trunk/capplet/gsm-app-dialog.c	Sat Aug 16 09:55:37 2008
@@ -61,7 +61,7 @@
         PROP_0,
         PROP_NAME,
         PROP_COMMAND,
-        PROP_COMMENT,
+        PROP_COMMENT
 };
 
 G_DEFINE_TYPE (GsmAppDialog, gsm_app_dialog, GTK_TYPE_DIALOG)

Modified: trunk/egg/eggdesktopfile.h
==============================================================================
--- trunk/egg/eggdesktopfile.h	(original)
+++ trunk/egg/eggdesktopfile.h	Sat Aug 16 09:55:37 2008
@@ -31,7 +31,7 @@
 
 	EGG_DESKTOP_FILE_TYPE_APPLICATION,
 	EGG_DESKTOP_FILE_TYPE_LINK,
-	EGG_DESKTOP_FILE_TYPE_DIRECTORY,
+	EGG_DESKTOP_FILE_TYPE_DIRECTORY
 } EggDesktopFileType;
 
 EggDesktopFile     *egg_desktop_file_new                (const char   *desktop_file_path,
@@ -146,7 +146,7 @@
 typedef enum {
 	EGG_DESKTOP_FILE_ERROR_INVALID,
 	EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE,
-	EGG_DESKTOP_FILE_ERROR_UNRECOGNIZED_OPTION,
+	EGG_DESKTOP_FILE_ERROR_UNRECOGNIZED_OPTION
 } EggDesktopFileError;
 
 /* Global application desktop file */

Modified: trunk/egg/eggsmclient-libgnomeui.c
==============================================================================
--- trunk/egg/eggsmclient-libgnomeui.c	(original)
+++ trunk/egg/eggsmclient-libgnomeui.c	Sat Aug 16 09:55:37 2008
@@ -107,7 +107,7 @@
 		NULL, /* init pass */
 		egg_sm_client_module_class_init,
 		NULL, /* opt prefix */
-		egg_sm_client_get_option_group,
+		egg_sm_client_get_option_group
 	};
 
 	return &module_info;

Modified: trunk/egg/eggsmclient-xsmp.c
==============================================================================
--- trunk/egg/eggsmclient-xsmp.c	(original)
+++ trunk/egg/eggsmclient-xsmp.c	Sat Aug 16 09:55:37 2008
@@ -63,7 +63,7 @@
   XSMP_STATE_INTERACT,
   XSMP_STATE_SAVE_YOURSELF_DONE,
   XSMP_STATE_SHUTDOWN_CANCELLED,
-  XSMP_STATE_CONNECTION_CLOSED,
+  XSMP_STATE_CONNECTION_CLOSED
 } EggSMClientXSMPState;
 
 static const char *state_names[] = {

Modified: trunk/gnome-session/gsm-autostart-app.c
==============================================================================
--- trunk/gnome-session/gsm-autostart-app.c	(original)
+++ trunk/gnome-session/gsm-autostart-app.c	Sat Aug 16 09:55:37 2008
@@ -36,7 +36,7 @@
 
 enum {
         AUTOSTART_LAUNCH_SPAWN = 0,
-        AUTOSTART_LAUNCH_ACTIVATE,
+        AUTOSTART_LAUNCH_ACTIVATE
 };
 
 enum {
@@ -44,7 +44,7 @@
         GSM_CONDITION_IF_EXISTS     = 1,
         GSM_CONDITION_UNLESS_EXISTS = 2,
         GSM_CONDITION_GNOME         = 3,
-        GSM_CONDITION_UNKNOWN       = 4,
+        GSM_CONDITION_UNKNOWN       = 4
 };
 
 #define GSM_SESSION_CLIENT_DBUS_INTERFACE "org.gnome.SessionClient"
@@ -79,7 +79,7 @@
 
 enum {
         PROP_0,
-        PROP_DESKTOP_FILENAME,
+        PROP_DESKTOP_FILENAME
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };

Modified: trunk/gnome-session/gsm-client.c
==============================================================================
--- trunk/gnome-session/gsm-client.c	(original)
+++ trunk/gnome-session/gsm-client.c	Sat Aug 16 09:55:37 2008
@@ -45,7 +45,7 @@
         PROP_ID,
         PROP_STARTUP_ID,
         PROP_APP_ID,
-        PROP_STATUS,
+        PROP_STATUS
 };
 
 enum {

Modified: trunk/gnome-session/gsm-client.h
==============================================================================
--- trunk/gnome-session/gsm-client.h	(original)
+++ trunk/gnome-session/gsm-client.h	Sat Aug 16 09:55:37 2008
@@ -43,18 +43,18 @@
         GSM_CLIENT_UNREGISTERED = 0,
         GSM_CLIENT_REGISTERED,
         GSM_CLIENT_FINISHED,
-        GSM_CLIENT_FAILED,
+        GSM_CLIENT_FAILED
 } GsmClientStatus;
 
 typedef enum {
         GSM_CLIENT_RESTART_NEVER = 0,
         GSM_CLIENT_RESTART_IF_RUNNING,
         GSM_CLIENT_RESTART_ANYWAY,
-        GSM_CLIENT_RESTART_IMMEDIATELY,
+        GSM_CLIENT_RESTART_IMMEDIATELY
 } GsmClientRestartStyle;
 
 typedef enum {
-        GSM_CLIENT_END_SESSION_FLAG_FORCEFUL = 1 << 0,
+        GSM_CLIENT_END_SESSION_FLAG_FORCEFUL = 1 << 0
 } GsmClientEndSessionFlag;
 
 struct _GsmClient

Modified: trunk/gnome-session/gsm-dbus-client.c
==============================================================================
--- trunk/gnome-session/gsm-dbus-client.c	(original)
+++ trunk/gnome-session/gsm-dbus-client.c	Sat Aug 16 09:55:37 2008
@@ -28,7 +28,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <dbus/dbus-glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -56,7 +55,7 @@
 
 enum {
         PROP_0,
-        PROP_BUS_NAME,
+        PROP_BUS_NAME
 };
 
 G_DEFINE_TYPE (GsmDBusClient, gsm_dbus_client, GSM_TYPE_CLIENT)

Modified: trunk/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.c	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.c	Sat Aug 16 09:55:37 2008
@@ -78,7 +78,7 @@
         PROP_0,
         PROP_ACTION,
         PROP_INHIBITOR_STORE,
-        PROP_CLIENT_STORE,
+        PROP_CLIENT_STORE
 };
 
 enum {
@@ -565,7 +565,7 @@
                 client_id = gsm_inhibitor_peek_client_id (inhibitor);
                 if (! IS_STRING_EMPTY (client_id)) {
                         GsmClient *client;
-                        client = (GsmClient *)gsm_store_lookup (dialog->priv->clients, client_id);
+                        client = GSM_CLIENT (gsm_store_lookup (dialog->priv->clients, client_id));
                         if (client != NULL) {
                                 freeme = name = gsm_client_get_app_name (client);
                         }

Modified: trunk/gnome-session/gsm-inhibit-dialog.h
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.h	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.h	Sat Aug 16 09:55:37 2008
@@ -44,7 +44,7 @@
         GSM_LOGOUT_ACTION_SHUTDOWN,
         GSM_LOGOUT_ACTION_REBOOT,
         GSM_LOGOUT_ACTION_HIBERNATE,
-        GSM_LOGOUT_ACTION_SLEEP,
+        GSM_LOGOUT_ACTION_SLEEP
 } GsmLogoutAction;
 
 typedef struct

Modified: trunk/gnome-session/gsm-inhibitor.c
==============================================================================
--- trunk/gnome-session/gsm-inhibitor.c	(original)
+++ trunk/gnome-session/gsm-inhibitor.c	Sat Aug 16 09:55:37 2008
@@ -58,7 +58,7 @@
         PROP_CLIENT_ID,
         PROP_FLAGS,
         PROP_TOPLEVEL_XID,
-        PROP_COOKIE,
+        PROP_COOKIE
 };
 
 G_DEFINE_TYPE (GsmInhibitor, gsm_inhibitor, G_TYPE_OBJECT)

Modified: trunk/gnome-session/gsm-inhibitor.h
==============================================================================
--- trunk/gnome-session/gsm-inhibitor.h	(original)
+++ trunk/gnome-session/gsm-inhibitor.h	Sat Aug 16 09:55:37 2008
@@ -52,7 +52,7 @@
 typedef enum {
         GSM_INHIBITOR_FLAG_LOGOUT      = 1 << 0,
         GSM_INHIBITOR_FLAG_SWITCH_USER = 1 << 1,
-        GSM_INHIBITOR_FLAG_SUSPEND     = 1 << 2,
+        GSM_INHIBITOR_FLAG_SUSPEND     = 1 << 2
 } GsmInhibitorFlag;
 
 typedef enum

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Sat Aug 16 09:55:37 2008
@@ -100,7 +100,7 @@
 enum {
         PROP_0,
         PROP_CLIENT_STORE,
-        PROP_FAILSAFE,
+        PROP_FAILSAFE
 };
 
 enum {
@@ -114,7 +114,7 @@
         LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0, };
+static guint signals [LAST_SIGNAL] = { 0 };
 
 static void     gsm_manager_class_init  (GsmManagerClass *klass);
 static void     gsm_manager_init        (GsmManager      *manager);

Modified: trunk/gnome-session/gsm-store.c
==============================================================================
--- trunk/gnome-session/gsm-store.c	(original)
+++ trunk/gnome-session/gsm-store.c	Sat Aug 16 09:55:37 2008
@@ -48,10 +48,10 @@
 
 enum {
         PROP_0,
-        PROP_LOCKED,
+        PROP_LOCKED
 };
 
-static guint signals [LAST_SIGNAL] = { 0, };
+static guint signals [LAST_SIGNAL] = { 0 };
 
 static void     gsm_store_class_init    (GsmStoreClass *klass);
 static void     gsm_store_init          (GsmStore      *store);

Modified: trunk/gnome-session/gsm-util.c
==============================================================================
--- trunk/gnome-session/gsm-util.c	(original)
+++ trunk/gnome-session/gsm-util.c	Sat Aug 16 09:55:37 2008
@@ -18,6 +18,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/types.h>

Modified: trunk/gnome-session/gsm-xsmp-client.c
==============================================================================
--- trunk/gnome-session/gsm-xsmp-client.c	(original)
+++ trunk/gnome-session/gsm-xsmp-client.c	Sat Aug 16 09:55:37 2008
@@ -60,7 +60,7 @@
 
 enum {
         PROP_0,
-        PROP_ICE_CONNECTION,
+        PROP_ICE_CONNECTION
 };
 
 enum {
@@ -377,6 +377,7 @@
         return g_string_free (str, FALSE);
 }
 
+#if 0
 static char *
 xsmp_get_restart_command (GsmClient *client)
 {
@@ -404,6 +405,7 @@
 
         return prop_to_command (prop);
 }
+#endif
 
 static void
 do_save_yourself (GsmXSMPClient *client,
@@ -456,6 +458,7 @@
         }
 }
 
+#if 0
 static void
 xsmp_save_yourself_phase2 (GsmClient *client)
 {
@@ -475,6 +478,7 @@
 
         SmsInteract (xsmp->priv->conn);
 }
+#endif
 
 static gboolean
 xsmp_cancel_end_session (GsmClient *client,

Modified: trunk/gnome-session/gsm-xsmp-server.c
==============================================================================
--- trunk/gnome-session/gsm-xsmp-server.c	(original)
+++ trunk/gnome-session/gsm-xsmp-server.c	Sat Aug 16 09:55:37 2008
@@ -75,7 +75,7 @@
 
 enum {
         PROP_0,
-        PROP_CLIENT_STORE,
+        PROP_CLIENT_STORE
 };
 
 static void     gsm_xsmp_server_class_init  (GsmXsmpServerClass *klass);

Modified: trunk/gnome-session/test-inhibit.c
==============================================================================
--- trunk/gnome-session/test-inhibit.c	(original)
+++ trunk/gnome-session/test-inhibit.c	Sat Aug 16 09:55:37 2008
@@ -65,7 +65,7 @@
 typedef enum {
         GSM_INHIBITOR_FLAG_LOGOUT      = 1 << 0,
         GSM_INHIBITOR_FLAG_SWITCH_USER = 1 << 1,
-        GSM_INHIBITOR_FLAG_SUSPEND     = 1 << 2,
+        GSM_INHIBITOR_FLAG_SUSPEND     = 1 << 2
 } GsmInhibitFlag;
 
 static gboolean

Modified: trunk/tools/gnome-session-save.c
==============================================================================
--- trunk/tools/gnome-session-save.c	(original)
+++ trunk/tools/gnome-session-save.c	Sat Aug 16 09:55:37 2008
@@ -105,6 +105,7 @@
         return bus;
 }
 
+#if 0
 static void
 set_session_name (const char  *session_name)
 {
@@ -151,6 +152,7 @@
                 g_object_unref (sm_proxy);
         }
 }
+#endif
 
 static void
 logout_session (gboolean show_confirmation)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]