empathy r1146 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Jun  4 14:42:14 2008
New Revision: 1146
URL: http://svn.gnome.org/viewvc/empathy?rev=1146&view=rev

Log:
Add a command line option to hide contact list on startup. Fixes bug #535080 (Marco Pesenti Gritti).


Modified:
   trunk/src/empathy-status-icon.c
   trunk/src/empathy-status-icon.h
   trunk/src/empathy.c

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Wed Jun  4 14:42:14 2008
@@ -739,7 +739,7 @@
 }
 
 EmpathyStatusIcon *
-empathy_status_icon_new (GtkWindow *window)
+empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list)
 {
 	EmpathyStatusIconPriv *priv;
 	EmpathyStatusIcon     *icon;
@@ -756,9 +756,13 @@
 			  G_CALLBACK (status_icon_delete_event_cb),
 			  icon);
 
-	empathy_conf_get_bool (empathy_conf_get (),
-			      EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
-			      &should_hide);
+	if (!hide_contact_list) {
+		empathy_conf_get_bool (empathy_conf_get (),
+				       EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+			               &should_hide);
+	} else {
+		should_hide = TRUE;
+	}
 
 	if (gtk_window_is_active (priv->window) == should_hide) {
 		status_icon_set_visibility (icon, !should_hide, FALSE);

Modified: trunk/src/empathy-status-icon.h
==============================================================================
--- trunk/src/empathy-status-icon.h	(original)
+++ trunk/src/empathy-status-icon.h	Wed Jun  4 14:42:14 2008
@@ -46,7 +46,8 @@
 };
 
 GType              empathy_status_icon_get_type (void) G_GNUC_CONST;
-EmpathyStatusIcon *empathy_status_icon_new      (GtkWindow *window);
+EmpathyStatusIcon *empathy_status_icon_new      (GtkWindow *window,
+						 gboolean   hide_contact_list);
 
 G_END_DECLS
 

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Wed Jun  4 14:42:14 2008
@@ -358,12 +358,17 @@
 	EmpathyIdle       *idle;
 	gboolean           autoconnect = TRUE;
 	gboolean           no_connect = FALSE; 
+	gboolean           hide_contact_list = FALSE;
 	GError            *error = NULL;
 	GOptionEntry       options[] = {
 		{ "no-connect", 'n',
 		  0, G_OPTION_ARG_NONE, &no_connect,
 		  N_("Don't connect on startup"),
 		  NULL },
+		{ "hide-contact-list", 'h',
+		  0, G_OPTION_ARG_NONE, &hide_contact_list,
+		  N_("Don't show the contact list on startup"),
+		  NULL },
 		{ NULL }
 	};
 
@@ -446,7 +451,7 @@
 
 	/* Setting up UI */
 	window = empathy_main_window_show ();
-	icon = empathy_status_icon_new (GTK_WINDOW (window));
+	icon = empathy_status_icon_new (GTK_WINDOW (window), hide_contact_list);
 
 	if (connection) {
 		/* We se the callback here because we need window */