]> git.0d.be Git - empathy.git/commitdiff
Remove contact-selector-dialog
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 19 Oct 2011 22:34:01 +0000 (09:34 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 19 Oct 2011 22:34:01 +0000 (09:34 +1100)
It's no longer used.

libempathy-gtk/Makefile.am
libempathy-gtk/empathy-contact-selector-dialog.c [deleted file]
libempathy-gtk/empathy-contact-selector-dialog.h [deleted file]
libempathy-gtk/empathy-contact-selector-dialog.ui [deleted file]

index 11a2927f87e7e6b40295c4fae565b13ddbf4809f..ccf87f2f0fbb58d23c188fdf023b9c9ccbfd590d 100644 (file)
@@ -49,7 +49,6 @@ libempathy_gtk_handwritten_source =                   \
        empathy-linking-dialog.c                \
        empathy-live-search.c                   \
        empathy-contact-search-dialog.c         \
-       empathy-contact-selector-dialog.c \
        empathy-contact-widget.c                \
        empathy-dialpad-widget.c                \
        empathy-geometry.c                      \
@@ -116,7 +115,6 @@ libempathy_gtk_headers =                    \
        empathy-linking-dialog.h                \
        empathy-live-search.h                   \
        empathy-contact-search-dialog.h         \
-       empathy-contact-selector-dialog.h \
        empathy-contact-widget.h                \
        empathy-dialpad-widget.h                \
        empathy-geometry.h                      \
@@ -209,7 +207,6 @@ ui_DATA =                                   \
        empathy-status-preset-dialog.ui         \
        empathy-log-window.ui                   \
        empathy-chat.ui                         \
-       empathy-contact-selector-dialog.ui      \
        empathy-search-bar.ui                   \
        empathy-individual-widget.ui
 
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
deleted file mode 100644 (file)
index d436c3e..0000000
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright (C) 2007-2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
- * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-contact-selector-dialog.h"
-#include "empathy-account-chooser.h"
-
-G_DEFINE_ABSTRACT_TYPE (EmpathyContactSelectorDialog,
-    empathy_contact_selector_dialog,
-    GTK_TYPE_DIALOG)
-
-typedef struct _EmpathyContactSelectorDialogPriv \
-          EmpathyContactSelectorDialogPriv;
-
-struct _EmpathyContactSelectorDialogPriv {
-  GtkListStore *store;
-  GtkWidget *account_chooser_label;
-  GtkWidget *account_chooser;
-  GtkWidget *entry_id;
-  EmpathyContactManager *contact_manager;
-  TpAccount *filter_account;
-
-  gboolean show_account_chooser;
-};
-
-#define GET_PRIV(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG, \
-    EmpathyContactSelectorDialogPriv))
-
-enum {
-  PROP_0,
-  PROP_SHOW_ACCOUNT_CHOOSER,
-  PROP_FILTER_ACCOUNT,
-  PROP_SELECTED_ACCOUNT
-};
-
-enum {
-  COMPLETION_COL_TEXT,
-  COMPLETION_COL_ID,
-  COMPLETION_COL_NAME,
-} CompletionCol;
-
-static void
-contact_selector_dialog_account_changed_cb (GtkWidget *widget,
-    EmpathyContactSelectorDialog *dialog)
-{
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-  EmpathyAccountChooser *chooser;
-  TpConnection *connection;
-  GList *members;
-
-  /* Remove completions */
-  gtk_list_store_clear (priv->store);
-
-  /* Get members of the new account */
-  chooser = EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser);
-  connection = empathy_account_chooser_get_connection (chooser);
-  if (!connection)
-    return;
-
-  if (priv->show_account_chooser)
-    {
-      EmpathyTpContactList *contact_list;
-
-      contact_list = empathy_contact_manager_get_list (priv->contact_manager,
-                   connection);
-      members = empathy_contact_list_get_members (
-          EMPATHY_CONTACT_LIST (contact_list));
-    }
-  else
-    {
-      if (priv->filter_account != NULL)
-        {
-          EmpathyTpContactList *contact_list;
-
-          connection = tp_account_get_connection (priv->filter_account);
-          if (connection == NULL)
-            return;
-
-          contact_list = empathy_contact_manager_get_list (
-              priv->contact_manager, connection);
-
-          members = empathy_contact_list_get_members (
-              EMPATHY_CONTACT_LIST (contact_list));
-        }
-      else
-        {
-          members = empathy_contact_list_get_members (
-              EMPATHY_CONTACT_LIST (priv->contact_manager));
-        }
-    }
-
-  /* Add members to the completion */
-  while (members)
-    {
-      EmpathyContact *contact = members->data;
-      GtkTreeIter iter;
-      gchar *tmpstr;
-
-      DEBUG ("Adding contact ID %s, Name %s",
-             empathy_contact_get_id (contact),
-             empathy_contact_get_alias (contact));
-
-      tmpstr = g_strdup_printf ("%s (%s)",
-        empathy_contact_get_alias (contact),
-        empathy_contact_get_id (contact));
-
-      gtk_list_store_insert_with_values (priv->store, &iter, -1,
-        COMPLETION_COL_TEXT, tmpstr,
-        COMPLETION_COL_ID, empathy_contact_get_id (contact),
-        COMPLETION_COL_NAME, empathy_contact_get_alias (contact),
-        -1);
-
-      g_free (tmpstr);
-
-      g_object_unref (contact);
-      members = g_list_delete_link (members, members);
-  }
-
-  g_object_notify (G_OBJECT (dialog), "selected-account");
-}
-
-static gboolean
-contact_selector_dialog_match_selected_cb (GtkEntryCompletion *widget,
-    GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyContactSelectorDialog *dialog)
-{
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-  gchar *id;
-
-  if (!iter || !model)
-    return FALSE;
-
-  gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &id, -1);
-  gtk_entry_set_text (GTK_ENTRY (priv->entry_id), id);
-
-  DEBUG ("Got selected match **%s**", id);
-
-  g_free (id);
-
-  return TRUE;
-}
-
-static gboolean
-contact_selector_dialog_match_func (GtkEntryCompletion *completion,
-    const gchar *key,
-    GtkTreeIter *iter,
-    gpointer user_data)
-{
-  GtkTreeModel *model;
-  gchar *str, *lower;
-  gboolean v = FALSE;
-
-  model = gtk_entry_completion_get_model (completion);
-  if (!model || !iter)
-    return FALSE;
-
-  gtk_tree_model_get (model, iter, COMPLETION_COL_NAME, &str, -1);
-  lower = g_utf8_strdown (str, -1);
-  if (strstr (lower, key))
-    {
-      DEBUG ("Key %s is matching name **%s**", key, str);
-      v = TRUE;
-      goto out;
-    }
-  g_free (str);
-  g_free (lower);
-
-  gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &str, -1);
-  lower = g_utf8_strdown (str, -1);
-  if (strstr (lower, key))
-    {
-      DEBUG ("Key %s is matching ID **%s**", key, str);
-      v = TRUE;
-      goto out;
-    }
-
-out:
-  g_free (str);
-  g_free (lower);
-
-  return v;
-}
-
-static void
-contact_selector_change_state_button_cb  (GtkEditable *editable,
-    EmpathyContactSelectorDialog *dialog)
-{
-  const gchar *id;
-  gboolean sensitive;
-
-  id = gtk_entry_get_text (GTK_ENTRY (editable));
-  sensitive = !EMP_STR_EMPTY (id);
-
-  gtk_widget_set_sensitive (dialog->button_action, sensitive);
-}
-
-static void
-account_chooser_filter (TpAccount *account,
-    EmpathyAccountChooserFilterResultCallback callback,
-    gpointer callback_data,
-    gpointer user_data)
-{
-  EmpathyContactSelectorDialog *self = user_data;
-  EmpathyContactSelectorDialogClass *class = \
-      EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self);
-
-  if (class->account_filter == NULL)
-    {
-      empathy_account_chooser_filter_is_connected (
-          account,callback, callback_data, user_data);
-      return;
-    }
-
-  class->account_filter (self, callback, callback_data, account);
-}
-
-static gboolean
-contact_selector_dialog_filter_visible (GtkTreeModel *model,
-                                        GtkTreeIter  *iter,
-                                        gpointer      data)
-{
-  EmpathyContactSelectorDialog *self = EMPATHY_CONTACT_SELECTOR_DIALOG (data);
-  gboolean r;
-  char *id;
-
-  gtk_tree_model_get (model, iter,
-      COMPLETION_COL_ID, &id,
-      -1);
-
-  /* this must be non-NULL for this function to get called */
-  r = EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self)->contact_filter (
-      self, id);
-
-  g_free (id);
-
-  return r;
-}
-
-static void
-empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
-{
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-  GtkBuilder *gui;
-  gchar *filename;
-  GtkEntryCompletion *completion;
-  GtkWidget *content_area;
-  GtkWidget *table_grid;
-
-  dialog->vbox = gtk_vbox_new (FALSE, 3);
-
-  /* create a contact manager */
-  priv->contact_manager = empathy_contact_manager_dup_singleton ();
-
-  filename = empathy_file_lookup ("empathy-contact-selector-dialog.ui",
-          "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
-                "table_grid", &table_grid,
-                "account_chooser_label", &priv->account_chooser_label,
-                "entry_id", &priv->entry_id,
-                NULL);
-  g_free (filename);
-
-  gtk_entry_set_activates_default (GTK_ENTRY (priv->entry_id), TRUE);
-
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_container_add (GTK_CONTAINER (content_area), dialog->vbox);
-  gtk_box_pack_start (GTK_BOX (dialog->vbox), table_grid, TRUE, TRUE, 0);
-  gtk_widget_show (dialog->vbox);
-
-  gtk_dialog_add_button (GTK_DIALOG (dialog),
-    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-  /* Tweak the dialog */
-  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
-  gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-
-  /* text completion */
-  priv->store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-  completion = gtk_entry_completion_new ();
-  gtk_entry_completion_set_text_column (completion, COMPLETION_COL_TEXT);
-  gtk_entry_completion_set_match_func (completion,
-               contact_selector_dialog_match_func,
-               NULL, NULL);
-  gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (priv->store));
-  gtk_entry_set_completion (GTK_ENTRY (priv->entry_id), completion);
-  g_signal_connect (completion, "match-selected",
-        G_CALLBACK (contact_selector_dialog_match_selected_cb),
-        dialog);
-  g_object_unref (completion);
-  g_object_unref (priv->store);
-
-  empathy_builder_connect (gui, dialog,
-             "entry_id", "changed", contact_selector_change_state_button_cb,
-             NULL);
-
-  g_object_unref (gui);
-
-  /* Create account chooser */
-  priv->show_account_chooser = TRUE;
-  priv->account_chooser = empathy_account_chooser_new ();
-  gtk_grid_attach (GTK_GRID (table_grid),
-           priv->account_chooser,
-           1, 0, 1, 1);
-  empathy_account_chooser_set_filter (
-      EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser),
-      account_chooser_filter,
-      dialog);
-  gtk_widget_show (priv->account_chooser);
-
-  contact_selector_dialog_account_changed_cb (priv->account_chooser, dialog);
-  g_signal_connect (priv->account_chooser, "changed",
-        G_CALLBACK (contact_selector_dialog_account_changed_cb),
-        dialog);
-}
-
-static void
-empathy_contact_selector_dialog_get_property (GObject *self,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-
-  switch (prop_id)
-    {
-      case PROP_SHOW_ACCOUNT_CHOOSER:
-        g_value_set_boolean (value,
-          empathy_contact_selector_dialog_get_show_account_chooser (dialog));
-        break;
-
-      case PROP_FILTER_ACCOUNT:
-        g_value_set_object (value,
-            empathy_contact_selector_dialog_get_filter_account (dialog));
-        break;
-
-      case PROP_SELECTED_ACCOUNT:
-        g_value_set_object (value, empathy_account_chooser_get_account (
-              EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser)));
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_contact_selector_dialog_set_property (GObject *self,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-
-  switch (prop_id)
-    {
-      case PROP_SHOW_ACCOUNT_CHOOSER:
-        empathy_contact_selector_dialog_set_show_account_chooser (dialog,
-            g_value_get_boolean (value));
-        break;
-
-      case PROP_FILTER_ACCOUNT:
-        empathy_contact_selector_dialog_set_filter_account (dialog,
-            g_value_get_object (value));
-        break;
-
-      case PROP_SELECTED_ACCOUNT:
-        empathy_account_chooser_set_account (
-            EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser),
-            g_value_get_object (value));
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_contact_selector_dialog_constructed (GObject *dialog)
-{
-  EmpathyContactSelectorDialog *self = EMPATHY_CONTACT_SELECTOR_DIALOG (dialog);
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
-
-  gtk_widget_set_can_default (self->button_action, TRUE);
-  gtk_widget_grab_default (self->button_action);
-
-  if (EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (dialog)->contact_filter)
-    {
-      GtkEntryCompletion *completion;
-      GtkTreeModel *filter;
-
-      completion = gtk_entry_get_completion (GTK_ENTRY (priv->entry_id));
-      filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store), NULL);
-
-      gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
-          contact_selector_dialog_filter_visible, dialog, NULL);
-
-      gtk_entry_completion_set_model (completion, filter);
-      g_object_unref (filter);
-    }
-}
-
-static void
-empathy_contact_selector_dialog_dispose (GObject *object)
-{
-  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (object);
-
-  if (priv->contact_manager != NULL) {
-    g_object_unref (priv->contact_manager);
-    priv->contact_manager = NULL;
-  }
-
-  if (priv->filter_account != NULL) {
-    g_object_unref (priv->filter_account);
-    priv->filter_account = NULL;
-  }
-
-  if (G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose (
-        object);
-}
-
-static void
-empathy_contact_selector_dialog_class_init (
-    EmpathyContactSelectorDialogClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  g_type_class_add_private (class, sizeof (EmpathyContactSelectorDialogPriv));
-
-  class->contact_filter = NULL;
-
-  object_class->constructed = empathy_contact_selector_dialog_constructed;
-  object_class->dispose = empathy_contact_selector_dialog_dispose;
-  object_class->get_property = empathy_contact_selector_dialog_get_property;
-  object_class->set_property = empathy_contact_selector_dialog_set_property;
-
-  g_object_class_install_property (object_class, PROP_SHOW_ACCOUNT_CHOOSER,
-      g_param_spec_boolean ("show-account-chooser",
-        "Show Account Chooser",
-        "Whether or not this dialog should show an account chooser",
-        TRUE,
-        G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_FILTER_ACCOUNT,
-      g_param_spec_object ("filter-account",
-        "Account to filter contacts",
-        "if 'show-account-chooser' is unset, only the contacts from this "
-        "account are displayed",
-        TP_TYPE_ACCOUNT,
-        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (object_class, PROP_SELECTED_ACCOUNT,
-      g_param_spec_object ("selected-account",
-        "Selected Account",
-        "Current account selected in the account-chooser",
-        TP_TYPE_ACCOUNT,
-        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-const gchar *
-empathy_contact_selector_dialog_get_selected (
-    EmpathyContactSelectorDialog *self,
-    TpConnection **connection,
-    TpAccount **account)
-{
-  EmpathyContactSelectorDialogPriv *priv;
-  const char *id;
-
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), NULL);
-
-  priv = GET_PRIV (self);
-
-  if (connection != NULL)
-    {
-      if (priv->show_account_chooser)
-        *connection = empathy_account_chooser_get_connection (
-            EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser));
-      else
-        *connection = NULL;
-    }
-
-  if (account != NULL)
-    {
-      if (priv->show_account_chooser)
-        *account = empathy_account_chooser_get_account (
-            EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser));
-      else
-        *account = NULL;
-    }
-
-
-  id = gtk_entry_get_text (GTK_ENTRY (priv->entry_id));
-  return id;
-}
-
-void
-empathy_contact_selector_dialog_set_show_account_chooser (
-    EmpathyContactSelectorDialog *self,
-    gboolean show_account_chooser)
-{
-  EmpathyContactSelectorDialogPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self));
-
-  priv = GET_PRIV (self);
-  priv->show_account_chooser = show_account_chooser;
-
-  gtk_widget_set_visible (priv->account_chooser_label, show_account_chooser);
-  gtk_widget_set_visible (priv->account_chooser, show_account_chooser);
-  contact_selector_dialog_account_changed_cb (priv->account_chooser, self);
-
-  g_object_notify (G_OBJECT (self), "show-account-chooser");
-}
-
-gboolean
-empathy_contact_selector_dialog_get_show_account_chooser (
-    EmpathyContactSelectorDialog *self)
-{
-  EmpathyContactSelectorDialogPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), FALSE);
-
-  priv = GET_PRIV (self);
-  return priv->show_account_chooser;
-}
-
-void
-empathy_contact_selector_dialog_set_filter_account (
-    EmpathyContactSelectorDialog *self,
-    TpAccount *account)
-{
-  EmpathyContactSelectorDialogPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self));
-
-  priv = GET_PRIV (self);
-  priv->filter_account = g_object_ref (account);
-
-  g_object_notify (G_OBJECT (self), "filter-account");
-}
-
-TpAccount *
-empathy_contact_selector_dialog_get_filter_account (
-    EmpathyContactSelectorDialog *self)
-{
-  EmpathyContactSelectorDialogPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), NULL);
-
-  priv = GET_PRIV (self);
-  return priv->filter_account;
-
-}
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.h b/libempathy-gtk/empathy-contact-selector-dialog.h
deleted file mode 100644 (file)
index 27d689c..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2007-2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
- * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_CONTACT_SELECTOR_DIALOG_H__
-#define __EMPATHY_CONTACT_SELECTOR_DIALOG_H__
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/account.h>
-
-#include "empathy-account-chooser.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyContactSelectorDialog EmpathyContactSelectorDialog;
-typedef struct _EmpathyContactSelectorDialogClass \
-          EmpathyContactSelectorDialogClass;
-
-struct _EmpathyContactSelectorDialogClass {
-  GtkDialogClass parent_class;
-
-  void (*account_filter) (EmpathyContactSelectorDialog *self,
-      EmpathyAccountChooserFilterResultCallback callback,
-      gpointer callback_data,
-      TpAccount *account);
-  gboolean (*contact_filter) (EmpathyContactSelectorDialog *self,
-      const char *id);
-};
-
-struct _EmpathyContactSelectorDialog {
-  GtkDialog parent;
-
-  /* protected fields */
-  GtkWidget *vbox;
-  GtkWidget *button_action;
-};
-
-GType empathy_contact_selector_dialog_get_type (void);
-const gchar *empathy_contact_selector_dialog_get_selected (
-    EmpathyContactSelectorDialog *self,
-    TpConnection **connection,
-    TpAccount **account);
-void empathy_contact_selector_dialog_set_show_account_chooser (
-    EmpathyContactSelectorDialog *self,
-    gboolean show_account_chooser);
-gboolean empathy_contact_selector_dialog_get_show_account_chooser (
-    EmpathyContactSelectorDialog *self);
-
-void empathy_contact_selector_dialog_set_filter_account (
-    EmpathyContactSelectorDialog *self,
-    TpAccount *account);
-
-TpAccount * empathy_contact_selector_dialog_get_filter_account (
-    EmpathyContactSelectorDialog *self);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG \
-  (empathy_contact_selector_dialog_get_type ())
-#define EMPATHY_CONTACT_SELECTOR_DIALOG(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG, \
-    EmpathyContactSelectorDialog))
-#define EMPATHY_CONTACT_SELECTOR_DIALOG_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG, \
-    EmpathyContactSelectorDialogClass))
-#define EMPATHY_IS_CONTACT_SELECTOR_DIALOG(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG))
-#define EMPATHY_IS_CONTACT_SELECTOR_DIALOG_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG))
-#define EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG, \
-    EmpathyContactSelectorDialogClass))
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_SELECTOR_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.ui b/libempathy-gtk/empathy-contact-selector-dialog.ui
deleted file mode 100644 (file)
index 9b7f921..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkGrid" id="table_grid">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="row_spacing">6</property>
-    <property name="column_spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="account_chooser_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Account:</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Contact ID:</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_id">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="activates_default">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>