[#1640] Do not put a system icon tray as default

sflphone-client-gnome/.settings/org.eclipse.cdt.core.prefs

-#Tue Feb 23 14:32:32 EST 2010
+#Fri Feb 26 15:32:40 EST 2010
 eclipse.preferences.version=1
 org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
@@ -124,8 +124,8 @@ org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert

sflphone-client-gnome/.settings/org.eclipse.cdt.ui.prefs

-#Thu Mar 26 14:05:05 EDT 2009
+#Fri Feb 26 15:30:12 EST 2010
 eclipse.preferences.version=1
-formatter_profile=org.eclipse.cdt.ui.default.gnu_profile
+formatter_profile=_GNU - SFLphone
 formatter_settings_version=1

sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml

@@ -461,6 +461,15 @@
       <arg type="i" name="posY" direction="in"/>
 	</method>
 	
+	<method name="enableStatusIcon">
+      <arg type="s" name="value" direction="in"/>
+	</method>
+		
+	<method name="isStatusIconEnabled">
+      <arg type="s" name="value" direction="out"/>
+	</method>
+	
+	
     <!-- Addressbook configuration -->
     <method name="getAddressbookSettings">
       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>

sflphone-client-gnome/src/dbus/dbus.c

@@ -2580,3 +2580,32 @@ void dbus_set_window_position_y (const guint posy) {
     }
 }
 
+
+void dbus_enable_status_icon (const gchar *value) {
+
+       GError *error = NULL;
+
+       org_sflphone_SFLphone_ConfigurationManager_enable_status_icon (configurationManagerProxy, value, &error);
+
+       if (error != NULL) {
+           ERROR ("Failed to call enable_status_icon on ConfigurationManager: %s",
+           error->message);
+           g_error_free (error);
+       }
+}
+
+gchar* dbus_is_status_icon_enabled (void) {
+
+       GError *error = NULL;
+       gchar* value = TRUE;
+
+       org_sflphone_SFLphone_ConfigurationManager_is_status_icon_enabled (configurationManagerProxy, &value, &error);
+
+       if (error != NULL) {
+           ERROR ("Failed to call is_status_icon_enabled on ConfigurationManager: %s",
+           error->message);
+           g_error_free (error);
+       }
+       return value;
+}
+

sflphone-client-gnome/src/dbus/dbus.h

@@ -606,4 +606,8 @@ guint dbus_get_window_position_y (void);
 void dbus_set_window_position_x (const guint posx);
 void dbus_set_window_position_y (const guint posy);
 
+void dbus_enable_status_icon (const gchar*);
+gchar* dbus_is_status_icon_enabled (void);
+
+
 #endif

sflphone-client-gnome/src/main.c

@@ -59,6 +59,7 @@ main(int argc, char *argv[])
 {
   // Handle logging
   int i;
+  gboolean statusicon = FALSE;
 
   // Startup logging
   startup_logging ();
@@ -88,25 +89,25 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
   textdomain ("sflphone-client-gnome");
 
   // Initialises the GNOME libraries
-  gnome_program_init (	"sflphone", VERSION,
-						LIBGNOMEUI_MODULE, argc, argv,
+  gnome_program_init ("sflphone", VERSION, LIBGNOMEUI_MODULE, argc, argv,
       GNOME_PROGRAM_STANDARD_PROPERTIES,
 						NULL) ;
 
   if (sflphone_init ())
     {
-#if GTK_CHECK_VERSION(2,10,0)
-      show_status_icon();
-#endif
+
+      if (g_strcasecmp (dbus_is_status_icon_enabled (), "true") == 0)
+          statusicon = TRUE;
+
+      if (statusicon)                   show_status_icon ();
       create_main_window ();
 
-#if GTK_CHECK_VERSION(2,10,0)
-      if (dbus_is_start_hidden())
+      if (statusicon && dbus_is_start_hidden ())
         {
           gtk_widget_hide (GTK_WIDGET( get_main_window() ));
           set_minimized (TRUE);
         }
-#endif
+
 
       status_bar_display_account ();
 

sflphone-client-gnome/src/mainwindow.c

@@ -47,7 +47,9 @@ GtkWidget * statusBar = NULL;
 GtkWidget * filterEntry = NULL;
 PidginScrollBook *embedded_error_notebook;
 
-static gboolean window_configure_cb (GtkWidget *win, GdkEventConfigure *event) {
+static gboolean
+window_configure_cb (GtkWidget *win, GdkEventConfigure *event)
+{
 
   int pos_x, pos_y;
 
@@ -61,23 +63,27 @@ static gboolean window_configure_cb (GtkWidget *win, GdkEventConfigure *event) {
   return FALSE;
 }
 
-
 /**
  * Minimize the main window.
  */
 static gboolean
 on_delete (GtkWidget * widget UNUSED, gpointer data UNUSED)
 {
-#if GTK_CHECK_VERSION(2,10,0)
+
+    if (g_strcasecmp (dbus_is_status_icon_enabled (), "true") == 0) {
         gtk_widget_hide (GTK_WIDGET( get_main_window() ));
         set_minimized (TRUE);
-#endif
+    }
+    else {
+      sflphone_quit ();
+    }
     return TRUE;
 }
 
 /** Ask the user if he wants to hangup current calls */
 gboolean
-main_window_ask_quit(){
+main_window_ask_quit ()
+{
   guint count = calllist_get_size (current_calls);
   GtkWidget * dialog;
   gint response;
@@ -93,13 +99,8 @@ main_window_ask_quit(){
     }
 
   dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window),
-			GTK_DIALOG_MODAL,
-			GTK_MESSAGE_QUESTION,
-			GTK_BUTTONS_YES_NO,
-			"%s\n%s",
-			question,
-			_("Do you still want to quit?") );
-
+      GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s\n%s",
+      question, _("Do you still want to quit?") );
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -115,18 +116,16 @@ main_window_ask_quit(){
   return TRUE;
 }
 
-
-
 static gboolean
 on_key_released (GtkWidget *widget, GdkEventKey *event, gpointer user_data UNUSED)
 {
   DEBUG("On key released from Main Window : %s", gtk_widget_get_name(widget));
 
-	if (focus_is_on_searchbar == FALSE) {
+  if (focus_is_on_searchbar == FALSE)
+    {
       // If a modifier key is pressed, it's a shortcut, pass along
-		if(event->state & GDK_CONTROL_MASK ||
-				event->state & GDK_MOD1_MASK    ||
-				event->keyval == 60             || // <
+      if (event->state & GDK_CONTROL_MASK || event->state & GDK_MOD1_MASK
+          || event->keyval == 60 || // <
           event->keyval == 62 || // >
           event->keyval == 34 || // "
           event->keyval == 65289 || // tab
@@ -144,17 +143,18 @@ on_key_released (GtkWidget *widget, GdkEventKey *event, gpointer user_data UNUSE
 }
 
 void
-focus_on_mainwindow_out(){
+focus_on_mainwindow_out ()
+{
   //  gtk_widget_grab_focus(GTK_WIDGET(window));
 
 }
 
 void
-focus_on_mainwindow_in(){
+focus_on_mainwindow_in ()
+{
   //  gtk_widget_grab_focus(GTK_WIDGET(window));
 }
 
-
 void
 create_main_window ()
 {
@@ -178,8 +178,7 @@ create_main_window ()
   gtk_container_set_border_width (GTK_CONTAINER (window), 0);
   gtk_window_set_title (GTK_WINDOW (window), window_title);
   gtk_window_set_default_size (GTK_WINDOW (window), width, height);
-	gtk_window_set_default_icon_from_file (LOGO,
-			NULL);
+  gtk_window_set_default_icon_from_file (LOGO, NULL);
   gtk_window_set_position (GTK_WINDOW( window ), GTK_WIN_POS_MOUSE);
 
   /* Connect the destroy event of the window with our on_destroy function
@@ -212,46 +211,59 @@ create_main_window ()
     }
 
   /* Create an accel group for window's shortcuts */
-	gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group (ui_manager));
+  gtk_window_add_accel_group (GTK_WINDOW(window),
+      gtk_ui_manager_get_accel_group (ui_manager));
 
   vbox = gtk_vbox_new (FALSE /*homogeneous*/, 0 /*spacing*/);
   subvbox = gtk_vbox_new (FALSE /*homogeneous*/, 5 /*spacing*/);
 
   create_menus (ui_manager, &widget);
-	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/,
+      0 /*padding*/);
 
   create_toolbar_actions (ui_manager, &widget);
   // Do not override GNOME user settings
-	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/,
+      0 /*padding*/);
 
-	gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-	gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-	gtk_box_pack_start (GTK_BOX (vbox), contacts->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/,
+      TRUE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/,
+      TRUE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), contacts->tree, TRUE /*expand*/,
+      TRUE /*fill*/, 0 /*padding*/);
 
-	gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/,
+      FALSE /*fill*/, 0 /*padding*/);
 
   embedded_error_notebook = PIDGIN_SCROLL_BOOK(pidgin_scroll_book_new());
-	gtk_box_pack_start(GTK_BOX(subvbox),
-			GTK_WIDGET(embedded_error_notebook), FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX(subvbox), GTK_WIDGET(embedded_error_notebook),
+      FALSE, FALSE, 0);
 
-	if(SHOW_VOLUME){
+  if (SHOW_VOLUME)
+    {
       speaker_control = create_slider ("speaker");
-		gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (speaker_control);
       mic_control = create_slider ("mic");
-		gtk_box_pack_end (GTK_BOX (subvbox), mic_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), mic_control, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (mic_control);
     }
 
-	if(SHOW_DIALPAD){
+  if (SHOW_DIALPAD)
+    {
       dialpad = create_dialpad ();
-		gtk_box_pack_end (GTK_BOX (subvbox), dialpad, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), dialpad, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (dialpad);
     }
 
   /* Status bar */
   statusBar = gtk_statusbar_new ();
-	gtk_box_pack_start (GTK_BOX (vbox), statusBar, FALSE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), statusBar, FALSE /*expand*/,
+      TRUE /*fill*/, 0 /*padding*/);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /* make sure that everything, window and label, are visible */
@@ -309,13 +321,12 @@ get_main_window()
 }
 
 void
-main_window_message(GtkMessageType type, gchar * markup){
+main_window_message (GtkMessageType type, gchar * markup)
+{
 
-	GtkWidget * dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(get_main_window()),
-			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-			type,
-			GTK_BUTTONS_CLOSE,
-			NULL);
+  GtkWidget * dialog = gtk_message_dialog_new_with_markup (
+      GTK_WINDOW(get_main_window()), GTK_DIALOG_MODAL
+          | GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_CLOSE, NULL);
 
   gtk_window_set_title (GTK_WINDOW(dialog), _("SFLphone Error"));
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog), markup);
@@ -325,43 +336,58 @@ main_window_message(GtkMessageType type, gchar * markup){
 }
 
 void
-main_window_error_message(gchar * markup){
+main_window_error_message (gchar * markup)
+{
   main_window_message (GTK_MESSAGE_ERROR, markup);
 }
 
 void
-main_window_warning_message(gchar * markup){
+main_window_warning_message (gchar * markup)
+{
   main_window_message (GTK_MESSAGE_WARNING, markup);
 }
 
 void
-main_window_info_message(gchar * markup){
+main_window_info_message (gchar * markup)
+{
   main_window_message (GTK_MESSAGE_INFO, markup);
 }
 
-void main_window_dialpad (gboolean state){
+void
+main_window_dialpad (gboolean state)
+{
 
   g_print ("main_window_dialpad\n");
 
-	if(state) {
+  if (state)
+    {
       dialpad = create_dialpad ();
-		gtk_box_pack_end (GTK_BOX (subvbox), dialpad, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), dialpad, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (dialpad);
-	} else {
+    }
+  else
+    {
       gtk_container_remove (GTK_CONTAINER (subvbox), dialpad);
     }
 }
 
 void
-main_window_volume_controls( gboolean state ){
-	if(state){
+main_window_volume_controls (gboolean state)
+{
+  if (state)
+    {
       speaker_control = create_slider ("speaker");
-		gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (speaker_control);
       mic_control = create_slider ("mic");
-		gtk_box_pack_end (GTK_BOX (subvbox), mic_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+      gtk_box_pack_end (GTK_BOX (subvbox), mic_control, FALSE /*expand*/,
+          TRUE /*fill*/, 0 /*padding*/);
       gtk_widget_show_all (mic_control);
-	} else {
+    }
+  else
+    {
       gtk_container_remove (GTK_CONTAINER(subvbox), speaker_control);
       gtk_container_remove (GTK_CONTAINER(subvbox), mic_control);
     }
@@ -399,23 +425,35 @@ main_window_zrtp_not_supported(callable_obj_t * c)
   gchar* warning_enabled = "";
 
   account_details = account_list_get_by_id (c->_accountID);
-	if(account_details != NULL) {
-		warning_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_ZRTP_NOT_SUPP_WARNING);
+  if (account_details != NULL)
+    {
+      warning_enabled = g_hash_table_lookup (account_details->properties,
+          ACCOUNT_ZRTP_NOT_SUPP_WARNING);
       DEBUG("Warning Enabled %s", warning_enabled);
-	} else {
+    }
+  else
+    {
       DEBUG("Account is null callID %s", c->_callID);
       GHashTable * properties = NULL;
       sflphone_get_ip2ip_properties (&properties);
       if (properties != NULL)
-		{ warning_enabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_NOT_SUPP_WARNING); }
+        {
+          warning_enabled = g_hash_table_lookup (properties,
+              ACCOUNT_ZRTP_NOT_SUPP_WARNING);
+        }
     }
 
-	if(g_strcasecmp(warning_enabled,"true") == 0) {
+  if (g_strcasecmp (warning_enabled, "true") == 0)
+    {
       PidginMiniDialog *mini_dialog;
-		gchar *desc = g_markup_printf_escaped(_("ZRTP is not supported by peer %s\n"), c->_peer_number);
-		mini_dialog = pidgin_mini_dialog_new(_("Secure Communication Unavailable"), desc, GTK_STOCK_DIALOG_WARNING);
+      gchar *desc = g_markup_printf_escaped (
+          _("ZRTP is not supported by peer %s\n"), c->_peer_number);
+      mini_dialog = pidgin_mini_dialog_new (
+          _("Secure Communication Unavailable"), desc,
+          GTK_STOCK_DIALOG_WARNING);
       pidgin_mini_dialog_add_button (mini_dialog, _("Continue"), NULL, NULL);
-		pidgin_mini_dialog_add_button(mini_dialog, _("Stop Call"), sflphone_hang_up, NULL);
+      pidgin_mini_dialog_add_button (mini_dialog, _("Stop Call"),
+          sflphone_hang_up, NULL);
 
       g_signal_connect_after(mini_dialog, "destroy", (GCallback) destroy_error_dialog_cb, c);
 
@@ -424,20 +462,28 @@ main_window_zrtp_not_supported(callable_obj_t * c)
 }
 
 void
-main_window_zrtp_negotiation_failed(const gchar* callID, const gchar* reason, const gchar* severity)
+main_window_zrtp_negotiation_failed (const gchar* callID, const gchar* reason,
+    const gchar* severity)
 {
   gchar* peer_number = "(number unknown)";
   callable_obj_t * c = NULL;
   c = calllist_get (current_calls, callID);
-	if (c != NULL) {
+  if (c != NULL)
+    {
       peer_number = c->_peer_number;
     }
 
   PidginMiniDialog *mini_dialog;
-	gchar *desc = g_markup_printf_escaped(_("A %s error forced the call with %s to fall under unencrypted mode.\nExact reason: %s\n"), severity, peer_number, reason);
-	mini_dialog = pidgin_mini_dialog_new(_("ZRTP negotiation failed"), desc, GTK_STOCK_DIALOG_WARNING);
+  gchar
+      *desc =
+          g_markup_printf_escaped (
+              _("A %s error forced the call with %s to fall under unencrypted mode.\nExact reason: %s\n"),
+              severity, peer_number, reason);
+  mini_dialog = pidgin_mini_dialog_new (_("ZRTP negotiation failed"), desc,
+      GTK_STOCK_DIALOG_WARNING);
   pidgin_mini_dialog_add_button (mini_dialog, _("Continue"), NULL, NULL);
-	pidgin_mini_dialog_add_button(mini_dialog, _("Stop Call"), sflphone_hang_up, NULL);
+  pidgin_mini_dialog_add_button (mini_dialog, _("Stop Call"), sflphone_hang_up,
+      NULL);
 
   g_signal_connect_after(mini_dialog, "destroy", (GCallback) destroy_error_dialog_cb, c);
 
@@ -448,13 +494,18 @@ main_window_zrtp_negotiation_failed(const gchar* callID, const gchar* reason, co
 main_window_confirm_go_clear (callable_obj_t * c)
 {
   PidginMiniDialog *mini_dialog;
-	gchar *desc = g_markup_printf_escaped(_("%s wants to stop using secure communication. Confirm will resume conversation without SRTP.\n"), c->_peer_number);
-	mini_dialog = pidgin_mini_dialog_new(_("Confirm Go Clear"), desc, GTK_STOCK_STOP);
-	pidgin_mini_dialog_add_button(mini_dialog, _("Confirm"), (PidginMiniDialogCallback)sflphone_set_confirm_go_clear, NULL);
-	pidgin_mini_dialog_add_button(mini_dialog, _("Stop Call"), sflphone_hang_up, NULL);
+  gchar
+      *desc =
+          g_markup_printf_escaped (
+              _("%s wants to stop using secure communication. Confirm will resume conversation without SRTP.\n"),
+              c->_peer_number);
+  mini_dialog = pidgin_mini_dialog_new (_("Confirm Go Clear"), desc,
+      GTK_STOCK_STOP);
+  pidgin_mini_dialog_add_button (mini_dialog, _("Confirm"),
+      (PidginMiniDialogCallback) sflphone_set_confirm_go_clear, NULL);
+  pidgin_mini_dialog_add_button (mini_dialog, _("Stop Call"), sflphone_hang_up,
+      NULL);
 
   add_error_dialog (GTK_WIDGET(mini_dialog), c);
 }
 
-
-

sflphone-client-gnome/src/statusicon.c

@@ -29,29 +29,35 @@ GtkStatusIcon *status;
 GtkWidget *show_menu_item, *hangup_menu_item;
 gboolean __minimized = MINIMIZED;
 
-void popup_main_window (void)
+void
+popup_main_window(void)
 {
   if (__POPUP_WINDOW)
     {
       gtk_widget_show(get_main_window());
-		gtk_window_move (GTK_WINDOW (get_main_window ()), dbus_get_window_position_x (), dbus_get_window_position_y ());
+      gtk_window_move(GTK_WINDOW (get_main_window ()),
+          dbus_get_window_position_x(), dbus_get_window_position_y());
       set_minimized(FALSE);
     }
 }
 
-void show_status_hangup_icon() {
-
+void
+show_status_hangup_icon()
+{
+  if (status) {
     DEBUG("Show Hangup in Systray");
     gtk_widget_show(GTK_WIDGET(hangup_menu_item));
-
+  }
 }
 
-void hide_status_hangup_icon() {
-
+void
+hide_status_hangup_icon()
+{
+  if (status) {
     DEBUG("Hide Hangup in Systray");
     gtk_widget_hide(GTK_WIDGET(hangup_menu_item));
   }
-
+}
 
 void
 status_quit(void * foo UNUSED)
@@ -71,18 +77,20 @@ status_icon_unminimize()
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(show_menu_item), TRUE);
 }
 
-
-gboolean main_widget_minimized()
+gboolean
+main_widget_minimized()
 {
   return __minimized;
 }
 
-void show_hide (void)
+void
+show_hide(void)
 {
   if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(show_menu_item)))
     {
       gtk_widget_show(GTK_WIDGET(get_main_window()));
-		gtk_window_move (GTK_WINDOW (get_main_window ()), dbus_get_window_position_x (), dbus_get_window_position_y ());
+      gtk_window_move(GTK_WINDOW (get_main_window ()),
+          dbus_get_window_position_x(), dbus_get_window_position_y());
       set_minimized(!MINIMIZED);
     }
   else
@@ -92,23 +100,23 @@ void show_hide (void)
     }
 }
 
-
-void status_click (GtkStatusIcon *status_icon UNUSED, void * foo UNUSED)
+void
+status_click(GtkStatusIcon *status_icon UNUSED, void * foo UNUSED)
 {
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(show_menu_item),
       !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(show_menu_item)));
 }
 
-void menu (GtkStatusIcon *status_icon,
-            guint button,
-            guint activate_time,
+void
+menu(GtkStatusIcon *status_icon, guint button, guint activate_time,
     GtkWidget * menu)
 {
   gtk_menu_popup(GTK_MENU(menu), NULL, NULL, gtk_status_icon_position_menu,
       status_icon, button, activate_time);
 }
 
-GtkWidget* create_menu()
+GtkWidget*
+create_menu()
 {
   GtkWidget * menu;
   GtkWidget * menu_items;
@@ -116,7 +124,8 @@ GtkWidget* create_menu()
 
   menu = gtk_menu_new();
 
-  show_menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Show main window"));
+  show_menu_item
+      = gtk_check_menu_item_new_with_mnemonic(_("_Show main window"));
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(show_menu_item), TRUE);
   gtk_menu_shell_append(GTK_MENU_SHELL (menu), show_menu_item);
   g_signal_connect(G_OBJECT (show_menu_item), "toggled",
@@ -134,7 +143,8 @@ GtkWidget* create_menu()
   menu_items = gtk_separator_menu_item_new();
   gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_items);
 
-  menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_QUIT, get_accel_group());
+  menu_items = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT,
+      get_accel_group());
   g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
       G_CALLBACK (status_quit),
       NULL);
@@ -159,31 +169,46 @@ show_status_icon()
   statusicon_set_tooltip();
 }
 
-void statusicon_set_tooltip () {
+void hide_status_icon (void) {
 
+    g_object_unref (status);
+    status = NULL;
+}
+
+
+void
+statusicon_set_tooltip()
+{
   int count;
   gchar *tip;
 
   // Add a tooltip to the system tray icon
   count = account_list_get_registered_accounts();
-	tip =  g_markup_printf_escaped ("%s - %s" ,
-									_("SFLphone"),
-									g_markup_printf_escaped(n_("%i active account", "%i active accounts", count),count));
+  tip = g_markup_printf_escaped("%s - %s", _("SFLphone"),
+      g_markup_printf_escaped(
+          n_("%i active account", "%i active accounts", count), count));
   gtk_status_icon_set_tooltip(status, tip);
   g_free(tip);
 }
 
-
-void status_tray_icon_blink (gboolean active)
+void
+status_tray_icon_blink(gboolean active)
 {
+  if (status) {
   // Set a different icon to notify of an event
-	active ? gtk_status_icon_set_from_file (status, LOGO_NOTIF) : gtk_status_icon_set_from_file (status, LOGO);
+  active ? gtk_status_icon_set_from_file(status, LOGO_NOTIF)
+      : gtk_status_icon_set_from_file(status, LOGO);
+  }
 }
 
-void status_tray_icon_online (gboolean online)
+void
+status_tray_icon_online(gboolean online)
 {
+  if (status) {
   // Set a different icon to notify of an event
-	online ? gtk_status_icon_set_from_file (status, LOGO) : gtk_status_icon_set_from_file (status, LOGO_OFFLINE);
+  online ? gtk_status_icon_set_from_file(status, LOGO)
+      : gtk_status_icon_set_from_file(status, LOGO_OFFLINE);
+  }
 }
 
 GtkStatusIcon*

sflphone-client-gnome/src/statusicon.h

@@ -36,10 +36,16 @@
 void popup_main_window (void);
 
 /**
- * Create the status icon 
+ * Create the system tray icon
  */
 void show_status_icon ();
 
+
+/**
+ * Hide the system tray icon
+ */
+void hide_status_icon ();
+
 /**
  * Set the menu active 
  */  

sflphone-common/src/dbus/configurationmanager-introspec.xml

@@ -461,6 +461,15 @@
       <arg type="i" name="posY" direction="in"/>
 	</method>
 	
+	<method name="enableStatusIcon">
+      <arg type="s" name="value" direction="in"/>
+	</method>
+		
+	<method name="isStatusIconEnabled">
+      <arg type="s" name="value" direction="out"/>
+	</method>
+	
+	
     <!-- Addressbook configuration -->
     <method name="getAddressbookSettings">
       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>

sflphone-common/src/dbus/configurationmanager.cpp

@@ -868,3 +868,13 @@ void ConfigurationManager::setWindowPositionY (const int32_t& posY) {
 
 	Manager::instance ().setConfig (PREFERENCES, WINDOW_POSITION_Y, posY);
 }
+
+void ConfigurationManager::enableStatusIcon (const std::string& value) {
+
+	Manager::instance ().setConfig (PREFERENCES, SHOW_STATUSICON, value);
+}
+
+std::string ConfigurationManager::isStatusIconEnabled (void) {
+
+	return Manager::instance ().getConfigString (PREFERENCES, SHOW_STATUSICON);
+}

sflphone-common/src/dbus/configurationmanager.h

@@ -123,6 +123,9 @@ public:
 	void setWindowPositionX (const int32_t& posX);
 	void setWindowPositionY (const int32_t& posY);
 
+	void enableStatusIcon (const std::string&);
+	std::string isStatusIconEnabled (void);
+
     std::map<std::string, int32_t> getAddressbookSettings (void);
     void setAddressbookSettings (const std::map<std::string, int32_t>& settings);
     std::vector< std::string > getAddressbookList ( void );

sflphone-common/src/user_cfg.h

@@ -64,6 +64,8 @@
 #define WINDOW_HEIGHT						"Window.height"
 #define WINDOW_POSITION_X					"Window.positionX"
 #define WINDOW_POSITION_Y					"Window.positionY"
+#define SHOW_STATUSICON						"Statusicon.show"
+
 
 #define IP2IP_PROFILE                       "IP2IP"    
 #define SIGNALISATION                       "VoIPLink"	                /** Section Signalisation */