[#4064] Make instant messaging enabled by default

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

@@ -130,7 +130,10 @@ incoming_message_cb (DBusGProxy *proxy UNUSED, const gchar* callID UNUSED, const
     conference_obj_t *conf = NULL;
 
     // do not display message if instant messaging is disabled
-    gboolean instant_messaging_enabled = eel_gconf_get_integer (INSTANT_MESSAGING_ENABLED);
+    gboolean instant_messaging_enabled = TRUE;
+
+    if (eel_gconf_key_exists (INSTANT_MESSAGING_ENABLED))
+        instant_messaging_enabled = eel_gconf_get_integer (INSTANT_MESSAGING_ENABLED);
 
     if (!instant_messaging_enabled)
         return;

sflphone-client-gnome/src/uimanager.c

@@ -191,7 +191,10 @@ update_actions()
     callable_obj_t * selectedCall = calltab_get_selected_call (active_calltree);
     conference_obj_t * selectedConf = calltab_get_selected_conf (active_calltree);
 
-    gboolean instant_messaging_enabled = eel_gconf_get_integer (INSTANT_MESSAGING_ENABLED);
+    gboolean instant_messaging_enabled = TRUE;
+
+    if (eel_gconf_key_exists (INSTANT_MESSAGING_ENABLED))
+        instant_messaging_enabled = eel_gconf_get_integer (INSTANT_MESSAGING_ENABLED);
 
     if (selectedCall) {
         // update icon in systray
@@ -1238,6 +1241,15 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
         }
 
         if (im) {
+
+            // do not display message if instant messaging is disabled
+            gboolean instant_messaging_enabled = TRUE;
+
+            if (eel_gconf_key_exists (INSTANT_MESSAGING_ENABLED))
+                instant_messaging_enabled = eel_gconf_get_integer (INSTANT_MESSAGING_ENABLED);
+
+            if (instant_messaging_enabled) {
+
                 menu_items = gtk_separator_menu_item_new();
                 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
                 gtk_widget_show (menu_items);
@@ -1251,6 +1263,7 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
                                   NULL);
                 gtk_widget_show (menu_items);
             }
+        }
 
     } else {
         DEBUG ("UIManager: Build call menus");