Remove Meego specific code

It's not used any more by Intel.

3 files changed, 0 insertions, 75 deletions

diff --git a/configure.ac b/configure.ac
index 4a4a43ce7..be604e734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,38 +479,6 @@ AC_SUBST(GEOCODE_CFLAGS)
 AC_SUBST(GEOCODE_LIBS)
 
 # -----------------------------------------------------------
-# meego widgets support
-# -----------------------------------------------------------
-AC_ARG_ENABLE(meego,
-              AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@],
-                             [Enable meego widgets]), ,
-                             enable_meego=no)
-
-if test "x$enable_meego" != "xno"; then
-    PKG_CHECK_MODULES(MEEGO,
-    [
-       mx-gtk-1.0
-       gio-unix-2.0
-    ], have_meego="yes", have_meego="no")
-
-    if test "x$have_meego" = "xyes"; then
-       AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
-    fi
-else
-   have_meego="no"
-fi
-
-if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
-   AC_MSG_ERROR([Could not find meego dependencies:
-
-$MEEGO_PKG_ERRORS])
-fi
-
-AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
-AC_SUBST(MEEGO_CFLAGS)
-AC_SUBST(MEEGO_LIBS)
-
-# -----------------------------------------------------------
 # nautilus-sendto
 # -----------------------------------------------------------
 AC_ARG_ENABLE(nautilus-sendto,
@@ -640,7 +608,6 @@ Configure summary:
 	Display maps (libchamplain).:  ${have_libchamplain}
 	Location awareness (Geoclue):  ${have_geoclue}
 	Geocode support (Geocode)...:  ${have_geocode}
-	Meego widgets...............:  ${have_meego}
 	Cheese webcam support ......:  ${have_cheese}
 	Camera monitoring...........:  ${have_gudev}
 
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 7530914fc..7494fa0a0 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1782,8 +1782,6 @@ out:
   { #cm, #proto, "empathy-account-widget-"#proto".ui", \
     account_widget_build_##proto }
 
-#ifndef HAVE_MEEGO
-/* Meego doesn't support registration */
 static void
 add_register_buttons (EmpathyAccountWidget *self,
     TpAccount *account)
@@ -1823,7 +1821,6 @@ add_register_buttons (EmpathyAccountWidget *self,
   gtk_widget_show (self->priv->radiobutton_reuse);
   gtk_widget_show (radiobutton_register);
 }
-#endif /* HAVE_MEEGO */
 
 static void
 remember_password_toggled_cb (GtkToggleButton *button,
@@ -2017,9 +2014,7 @@ do_constructed (GObject *obj)
   else
     account_widget_set_control_buttons_sensitivity (self, FALSE);
 
-#ifndef HAVE_MEEGO
   add_register_buttons (self, account);
-#endif /* HAVE_MEEGO */
 
   /* hook up to widget destruction to unref ourselves */
   g_signal_connect (self->ui_details->widget, "destroy",
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 8f5397912..9a07325f0 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1391,24 +1391,6 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
   accounts_dialog_remove_account_iter (dialog, &iter);
 }
 
-#ifdef HAVE_MEEGO
-static void
-accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell,
-    const gchar *path_string,
-    EmpathyAccountsDialog *dialog)
-{
-  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
-  if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
-    return;
-
-  accounts_dialog_remove_account_iter (dialog, &iter);
-}
-#endif /* HAVE_MEEGO */
-
 static void
 accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
 {
@@ -1460,20 +1442,6 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
       G_CALLBACK (accounts_dialog_name_editing_started_cb),
       dialog);
   g_object_set (priv->name_renderer, "ypad", 4, NULL);
-
-#ifdef HAVE_MEEGO
-  /* Delete column */
-  cell = empathy_cell_renderer_activatable_new ();
-  gtk_tree_view_column_pack_start (column, cell, FALSE);
-  g_object_set (cell,
-        "icon-name", GTK_STOCK_DELETE,
-        "show-on-select", TRUE,
-        NULL);
-
-  g_signal_connect (cell, "path-activated",
-      G_CALLBACK (accounts_dialog_view_delete_activated_cb),
-      dialog);
-#endif /* HAVE_MEEGO */
 }
 
 static EmpathyAccountSettings *
@@ -2480,11 +2448,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
 
   action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 
-#ifdef HAVE_MEEGO
-  gtk_widget_hide (action_area);
-  gtk_widget_hide (priv->button_remove);
-#endif /* HAVE_MEEGO */
-
   /* Display loading page */
   priv->loading = TRUE;