totem r6192 - in branches/gnome-2-26: . src

[chpe svn gnome org]

Author: chpe
Date: Tue Mar 24 22:51:24 2009
New Revision: 6192
URL: http://svn.gnome.org/viewvc/totem?rev=6192&view=rev

Log:
	* src/totem-session.c: (totem_session_restore):
	* src/totem-session.h:
	* src/totem.c: (main): Add smclient options when parsing totem's
	command line. Bug #576620.

Modified:
   branches/gnome-2-26/ChangeLog
   branches/gnome-2-26/src/totem-session.c
   branches/gnome-2-26/src/totem-session.h
   branches/gnome-2-26/src/totem.c

Modified: branches/gnome-2-26/src/totem-session.c
==============================================================================
--- branches/gnome-2-26/src/totem-session.c	(original)
+++ branches/gnome-2-26/src/totem-session.c	Tue Mar 24 22:51:24 2009
@@ -104,6 +104,12 @@
 }
 
 void
+totem_session_add_options (GOptionContext *context)
+{
+	g_option_context_add_group (context, egg_sm_client_get_option_group ());
+}
+
+void
 totem_session_setup (Totem *totem, char **argv)
 {
 	EggSMClient *sm_client;
@@ -157,6 +163,11 @@
 #else
 
 void
+totem_session_add_options (GOptionContext *context)
+{
+}
+
+void
 totem_session_setup (Totem *totem, char **argv)
 {
 }

Modified: branches/gnome-2-26/src/totem-session.h
==============================================================================
--- branches/gnome-2-26/src/totem-session.h	(original)
+++ branches/gnome-2-26/src/totem-session.h	Tue Mar 24 22:51:24 2009
@@ -27,6 +27,7 @@
 
 G_BEGIN_DECLS
 
+void totem_session_add_options (GOptionContext *context);
 void totem_session_setup (Totem *totem, char **argv);
 void totem_session_restore (Totem *totem, char **filenames);
 

Modified: branches/gnome-2-26/src/totem.c
==============================================================================
--- branches/gnome-2-26/src/totem.c	(original)
+++ branches/gnome-2-26/src/totem.c	Tue Mar 24 22:51:24 2009
@@ -149,6 +149,7 @@
 	g_option_context_add_group (context, baconoptiongroup);
 
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+	totem_session_add_options (context);
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
 		g_print (_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
 				error->message, argv[0]);