Remove conditional build of VOIP.

svn path=/trunk/; revision=1038

diff --git a/configure.ac b/configure.ac
index f307ffe02822360ac8efbf8601b917df86a6b016..bcd2f0f817e8037b938e380829617ded2c1c7071 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -268,20 +268,6 @@ fi
 
 AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 
-# -----------------------------------------------------------
-# VoIP support
-# -----------------------------------------------------------
-AC_ARG_ENABLE(voip,
-              AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@],
-                             [Add support for Voice and Video call]), ,
-                             enable_voip=yes)
-
-if test "x$enable_voip" = "xyes"; then
-   AC_DEFINE(HAVE_VOIP, 1, [Define if we have voip])
-fi
-
-AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
-
 # -----------------------------------------------------------
 
 AC_OUTPUT([

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 5d74be73b51289e90f01adcd4296daf5ea7be615..fa96eb492ecc0dced8f65db84963af103e9ccf43 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -163,7 +163,6 @@ enum {
 
 G_DEFINE_TYPE (EmpathyContactListStore, empathy_contact_list_store, GTK_TYPE_TREE_STORE);
 
-
 static gboolean
 contact_list_store_iface_setup (gpointer user_data)
 {

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index af93524649eeba0f9f06ff029a5d08b86cce9c04..8f7c65473aa35ad72b20477beb2b59460ec5135e 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -138,13 +138,11 @@ static void        contact_list_view_pixbuf_cell_data_func     (GtkTreeViewColum
                                                                GtkTreeModel               *model,
                                                                GtkTreeIter                *iter,
                                                                EmpathyContactListView     *view);
-#ifdef HAVE_VOIP
 static void        contact_list_view_voip_cell_data_func       (GtkTreeViewColumn          *tree_column,
                                                                GtkCellRenderer            *cell,
                                                                GtkTreeModel               *model,
                                                                GtkTreeIter                *iter,
                                                                EmpathyContactListView     *view);
-#endif
 static void        contact_list_view_avatar_cell_data_func     (GtkTreeViewColumn          *tree_column,
                                                                GtkCellRenderer            *cell,
                                                                GtkTreeModel               *model,
@@ -171,11 +169,9 @@ static void        contact_list_view_row_activated_cb          (EmpathyContactLi
                                                                GtkTreePath                *path,
                                                                GtkTreeViewColumn          *col,
                                                                gpointer                    user_data);
-#ifdef HAVE_VOIP
 static void        contact_list_view_voip_activated_cb         (EmpathyCellRendererActivatable *cell,
                                                                const gchar                *path_string,
                                                                EmpathyContactListView     *view);
-#endif
 static void        contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView      *view,
                                                                GtkTreeIter                *iter,
                                                                GtkTreePath                *path,
@@ -234,12 +230,10 @@ static const GtkActionEntry entries[] = {
          N_("_View Previous Conversations"), NULL, N_("View previous conversations with this contact"),
          G_CALLBACK (contact_list_view_action_cb)
        },
-#ifdef HAVE_VOIP
        { "Call", EMPATHY_IMAGE_VOIP,
          N_("_Call"), NULL, N_("Start a voice or video conversation with this contact"),
          G_CALLBACK (contact_list_view_action_cb)
        },
-#endif
 };
 
 static guint n_entries = G_N_ELEMENTS (entries);
@@ -248,9 +242,7 @@ static const gchar *ui_info =
        "<ui>"
        "  <popup name='Contact'>"
        "    <menuitem action='Chat'/>"
-#ifdef HAVE_VOIP
        "    <menuitem action='Call'/>"
-#endif
        "    <menuitem action='Log'/>"
        "    <menuitem action='SendFile'/>"
        "    <separator/>"
@@ -628,7 +620,6 @@ contact_list_view_setup (EmpathyContactListView *view)
        gtk_tree_view_column_add_attribute (col, cell,
                                            "is_group", EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP);
 
-#ifdef HAVE_VOIP
        /* Voip Capability Icon */
        cell = empathy_cell_renderer_activatable_new ();
        gtk_tree_view_column_pack_start (col, cell, FALSE);
@@ -644,7 +635,6 @@ contact_list_view_setup (EmpathyContactListView *view)
        g_signal_connect (cell, "path-activated",
                          G_CALLBACK (contact_list_view_voip_activated_cb),
                          view);
-#endif
 
        /* Avatar */
        cell = gtk_cell_renderer_pixbuf_new ();
@@ -1062,7 +1052,6 @@ contact_list_view_pixbuf_cell_data_func (GtkTreeViewColumn     *tree_column,
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
 
-#ifdef HAVE_VOIP
 static void
 contact_list_view_voip_cell_data_func (GtkTreeViewColumn      *tree_column,
                                       GtkCellRenderer        *cell,
@@ -1087,7 +1076,6 @@ contact_list_view_voip_cell_data_func (GtkTreeViewColumn      *tree_column,
 
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
-#endif
 
 static void
 contact_list_view_avatar_cell_data_func (GtkTreeViewColumn     *tree_column,
@@ -1202,11 +1190,9 @@ contact_list_view_get_contact_menu (EmpathyContactListView *view,
        action = gtk_ui_manager_get_action (priv->ui, "/Contact/Chat");
        gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT);
 
-#ifdef HAVE_VOIP
        action = gtk_ui_manager_get_action (priv->ui, "/Contact/Call");
        gtk_action_set_sensitive (action, can_voip);
        gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL);
-#endif
 
        action = gtk_ui_manager_get_action (priv->ui, "/Contact/Log");
        gtk_action_set_sensitive (action, can_show_log);
@@ -1371,7 +1357,6 @@ contact_list_view_row_activated_cb (EmpathyContactListView *view,
        }
 }
 
-#ifdef HAVE_VOIP
 static void
 contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell,
                                     const gchar                    *path_string,
@@ -1400,8 +1385,6 @@ contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell,
                g_object_unref (contact);
        }
 }
-#endif
-
 
 static void
 contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView *view,

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index b3faf3a016c2be50ae726645506b34d57de4a14f..8a8d937c44ea3d2740978fd910cbaa677afca1de 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -157,10 +157,6 @@ empathy_new_message_dialog_show (GtkWindow *parent)
        gtk_widget_set_sensitive (dialog->button_chat, FALSE);
        gtk_widget_set_sensitive (dialog->button_call, FALSE);
 
-#ifndef HAVE_VOIP
-       gtk_widget_hide (dialog->button_call);
-#endif
-
        gtk_widget_show (dialog->dialog);
 
        return dialog->dialog;

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 2c7ce1de07d09b9b16426fb90a232c5abb208e10..8f5c72df5a2d515eeaef4e94b1c77c969960b2f4 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -345,7 +345,6 @@ empathy_mission_control_new (void)
 void
 empathy_call_with_contact (EmpathyContact *contact)
 {
-#ifdef HAVE_VOIP
        MissionControl        *mc;
        McAccount             *account;
        TpConnection          *connection;
@@ -404,13 +403,11 @@ empathy_call_with_contact (EmpathyContact *contact)
        g_object_unref (connection);
        g_object_unref (channel);
        g_free (object_path);
-#endif
 }
 
 void
 empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
 {
-#ifdef HAVE_VOIP
        EmpathyContactFactory *factory;
        EmpathyContact        *contact;
 
@@ -422,7 +419,6 @@ empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
 
        g_object_unref (contact);
        g_object_unref (factory);
-#endif
 }
 
 void

diff --git a/src/empathy-filter.c b/src/empathy-filter.c
index d32a9dfe172dfe03370827c76f6d11715a118567..17da506a8e35d8508c189b7793a29f067ee6b5eb 100644 (file)
--- a/src/empathy-filter.c
+++ b/src/empathy-filter.c
@@ -257,7 +257,6 @@ filter_chat_handle_channel (EmpathyFilter *filter,
        }
 }
 
-#ifdef HAVE_VOIP
 static void
 filter_call_dispatch (EmpathyFilter *filter,
                      gpointer       user_data)
@@ -314,7 +313,6 @@ filter_call_handle_channel (EmpathyFilter *filter,
                                  filter);      
        }
 }
-#endif
 
 static void
 filter_contact_list_subscribe (EmpathyFilter *filter,
@@ -763,11 +761,9 @@ filter_conection_new_channel_cb (TpConnection *connection,
        if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) {
                func = filter_chat_handle_channel;
        }
-#ifdef HAVE_VOIP
        else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
                func = filter_call_handle_channel;
        }
-#endif
        else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST)) {
                func = filter_contact_list_handle_channel;
        }
@@ -820,7 +816,6 @@ filter_connection_list_channels_cb (TpConnection    *connection,
        }
 }
 
-#ifdef HAVE_VOIP
 static void
 filter_connection_advertise_capabilities_cb (TpConnection    *connection,
                                             const GPtrArray *capabilities,
@@ -833,19 +828,16 @@ filter_connection_advertise_capabilities_cb (TpConnection    *connection,
                               error->message);
        }
 }
-#endif
 
 static void
 filter_connection_ready_cb (TpConnection  *connection,
                            gpointer       unused,
                            EmpathyFilter *filter)
 {
-#ifdef HAVE_VOIP
        GPtrArray   *capabilities;
        GType        cap_type;
        GValue       cap = {0, };
        const gchar *remove = NULL;
-#endif
 
        empathy_debug (DEBUG_DOMAIN, "Connection ready, accepting new channels");
 
@@ -858,7 +850,6 @@ filter_connection_ready_cb (TpConnection  *connection,
                                              NULL, NULL,
                                              G_OBJECT (filter));
 
-#ifdef HAVE_VOIP
        /* Advertise VoIP capabilities */
        capabilities = g_ptr_array_sized_new (1);
        cap_type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING,
@@ -879,7 +870,6 @@ filter_connection_ready_cb (TpConnection  *connection,
                capabilities, &remove,
                filter_connection_advertise_capabilities_cb,
                NULL, NULL, G_OBJECT (filter));
-#endif
 }
 
 static void