aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-07-06 00:09:35 +0800
committerTravis Reitter <treitter@gmail.com>2010-08-16 23:59:00 +0800
commit0bb172885c0bcaa133a091bde15805aa98912503 (patch)
treef281b2cc72164db063367c56af35bd64ff91ac79
parentab7d6e660430a089bde964895a8229cb2f96ca55 (diff)
downloadgsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar.gz
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar.bz2
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar.lz
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar.xz
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.tar.zst
gsoc2013-empathy-0bb172885c0bcaa133a091bde15805aa98912503.zip
Show information for all an individual's personas in the information dialogue
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.c262
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.h60
-rw-r--r--libempathy-gtk/empathy-individual-menu.c8
4 files changed, 326 insertions, 6 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index fea658c0d..5cb086e23 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -54,6 +54,7 @@ libempathy_gtk_handwritten_source = \
empathy-contact-widget.c \
empathy-geometry.c \
empathy-individual-dialogs.c \
+ empathy-individual-information-dialog.c \
empathy-individual-linker.c \
empathy-individual-menu.c \
empathy-individual-store.c \
@@ -110,6 +111,7 @@ libempathy_gtk_headers = \
empathy-geometry.h \
empathy-images.h \
empathy-individual-dialogs.h \
+ empathy-individual-information-dialog.h \
empathy-individual-linker.h \
empathy-individual-menu.h \
empathy-individual-store.h \
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
new file mode 100644
index 000000000..492ae8fc5
--- /dev/null
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -0,0 +1,262 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007-2010 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>
+ * Philip Withnall <philip.withnall@collabora.co.uk>
+ * Travis Reitter <travis.reitter@collabora.co.uk>
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+
+#include <telepathy-glib/util.h>
+#include <folks/folks.h>
+#include <folks/folks-telepathy.h>
+
+#include <libempathy/empathy-individual-manager.h>
+#include <libempathy/empathy-utils.h>
+
+#include "empathy-individual-information-dialog.h"
+#include "empathy-contact-widget.h"
+#include "empathy-ui-utils.h"
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
+typedef struct {
+ FolksIndividual *individual;
+} EmpathyIndividualInformationDialogPriv;
+
+enum {
+ PROP_0,
+ PROP_INDIVIDUAL,
+};
+
+/* Info dialogs currently open.
+ * Each dialog contains a referenced pointer to its Individual */
+static GList *information_dialogs = NULL;
+
+G_DEFINE_TYPE (EmpathyIndividualInformationDialog,
+ empathy_individual_information_dialog, GTK_TYPE_DIALOG);
+
+static void
+individual_dialogs_response_cb (GtkDialog *dialog,
+ gint response,
+ GList **dialogs)
+{
+ *dialogs = g_list_remove (*dialogs, dialog);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static gint
+individual_dialogs_find (GObject *object,
+ FolksIndividual *individual)
+{
+ EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object);
+
+ return individual != priv->individual;
+}
+
+void
+empathy_individual_information_dialog_show (FolksIndividual *individual,
+ GtkWindow *parent)
+{
+ GtkWidget *dialog;
+ GList *l;
+
+ g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
+ g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
+
+ l = g_list_find_custom (information_dialogs, individual,
+ (GCompareFunc) individual_dialogs_find);
+
+ if (l != NULL)
+ {
+ gtk_window_present (GTK_WINDOW (l->data));
+ return;
+ }
+
+ /* Create dialog */
+ dialog = g_object_new (EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG,
+ "individual", individual,
+ NULL);
+
+ information_dialogs = g_list_prepend (information_dialogs, dialog);
+ gtk_widget_show (dialog);
+}
+
+static void
+individual_information_dialog_set_individual (
+ EmpathyIndividualInformationDialog *dialog,
+ FolksIndividual *individual)
+{
+ EmpathyIndividualInformationDialogPriv *priv;
+ GList *personas, *l;
+
+ g_return_if_fail (EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (dialog));
+ g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
+
+ priv = GET_PRIV (dialog);
+
+ gtk_window_set_title (GTK_WINDOW (dialog),
+ folks_individual_get_alias (individual));
+
+ personas = folks_individual_get_personas (individual);
+
+ for (l = personas; l != NULL; l = l->next)
+ {
+ GtkWidget *contact_widget;
+ TpContact *tp_contact;
+ EmpathyContact *contact;
+ TpfPersona *persona = l->data;
+
+ if (!TPF_IS_PERSONA (persona))
+ continue;
+
+ tp_contact = tpf_persona_get_contact (persona);
+ contact = empathy_contact_dup_from_tp_contact (tp_contact);
+
+ /* Contact info widget */
+ contact_widget = empathy_contact_widget_new (contact,
+ EMPATHY_CONTACT_WIDGET_SHOW_LOCATION |
+ EMPATHY_CONTACT_WIDGET_SHOW_DETAILS);
+ gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (
+ GTK_DIALOG (dialog))), contact_widget, TRUE, TRUE, 0);
+ gtk_widget_show (contact_widget);
+
+ g_object_unref (contact);
+ }
+
+ priv->individual = g_object_ref (individual);
+}
+
+static void
+individual_information_dialog_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object);
+
+ switch (param_id) {
+ case PROP_INDIVIDUAL:
+ g_value_set_object (value, priv->individual);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
+}
+
+static void
+individual_information_dialog_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyIndividualInformationDialog *dialog =
+ EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object);
+
+ switch (param_id) {
+ case PROP_INDIVIDUAL:
+ individual_information_dialog_set_individual (dialog,
+ FOLKS_INDIVIDUAL (g_value_get_object (value)));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ };
+}
+
+static void
+individual_information_dialog_constructed (GObject *object)
+{
+ GtkDialog *dialog = GTK_DIALOG (object);
+ GtkWidget *button;
+
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+ /* Close button */
+ button = gtk_button_new_with_label (GTK_STOCK_CLOSE);
+ gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
+ GTK_RESPONSE_CLOSE);
+ gtk_widget_set_can_default (button, TRUE);
+ gtk_window_set_default (GTK_WINDOW (dialog), button);
+ gtk_widget_show (button);
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (individual_dialogs_response_cb), &information_dialogs);
+}
+
+static void
+individual_information_dialog_finalize (GObject *object)
+{
+ EmpathyIndividualInformationDialog *dialog;
+ EmpathyIndividualInformationDialogPriv *priv;
+
+ dialog = EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object);
+ priv = GET_PRIV (dialog);
+
+ g_object_unref (priv->individual);
+
+ G_OBJECT_CLASS (
+ empathy_individual_information_dialog_parent_class)->finalize (object);
+}
+
+static void
+empathy_individual_information_dialog_class_init (
+ EmpathyIndividualInformationDialogClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = individual_information_dialog_finalize;
+ object_class->get_property = individual_information_dialog_get_property;
+ object_class->set_property = individual_information_dialog_set_property;
+ object_class->constructed = individual_information_dialog_constructed;
+
+ g_object_class_install_property (object_class,
+ PROP_INDIVIDUAL,
+ g_param_spec_object ("individual",
+ "Folks Individual",
+ "Folks Individual to base the dialog upon",
+ FOLKS_TYPE_INDIVIDUAL,
+ G_PARAM_CONSTRUCT |
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
+
+ g_type_class_add_private (object_class,
+ sizeof (EmpathyIndividualInformationDialogPriv));
+}
+
+static void
+empathy_individual_information_dialog_init (
+ EmpathyIndividualInformationDialog *dialog)
+{
+ EmpathyIndividualInformationDialogPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ dialog, EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG,
+ EmpathyIndividualInformationDialogPriv);
+
+ dialog->priv = priv;
+ priv->individual = NULL;
+}
diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h
new file mode 100644
index 000000000..aad26702f
--- /dev/null
+++ b/libempathy-gtk/empathy-individual-information-dialog.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2010 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: Philip Withnall <philip.withnall@collabora.co.uk>
+ * Travis Reitter <travis.reitter@collabora.co.uk>
+ */
+
+#ifndef __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
+#define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+#include <folks/folks.h>
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG (empathy_individual_information_dialog_get_type ())
+#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialog))
+#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass))
+#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG))
+#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG))
+#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass))
+
+typedef struct _EmpathyIndividualInformationDialog EmpathyIndividualInformationDialog;
+typedef struct _EmpathyIndividualInformationDialogClass EmpathyIndividualInformationDialogClass;
+
+struct _EmpathyIndividualInformationDialog {
+ GtkDialog parent;
+
+ /*<private>*/
+ gpointer priv;
+};
+
+struct _EmpathyIndividualInformationDialogClass {
+ GtkDialogClass parent_class;
+};
+
+GType empathy_individual_information_dialog_get_type (void) G_GNUC_CONST;
+
+void empathy_individual_information_dialog_show (FolksIndividual *individual,
+ GtkWindow *parent);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 4e625308f..1d080aada 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -41,6 +41,7 @@
#include "empathy-log-window.h"
#include "empathy-contact-dialogs.h"
#include "empathy-individual-dialogs.h"
+#include "empathy-individual-information-dialog.h"
#include "empathy-ui-utils.h"
#include "empathy-share-my-desktop.h"
#include "empathy-linking-dialog.h"
@@ -531,12 +532,7 @@ empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
static void
individual_info_menu_item_activate_cb (FolksIndividual *individual)
{
- EmpathyContact *contact;
-
- contact = empathy_contact_dup_from_folks_individual (individual);
- empathy_contact_information_dialog_show (contact, NULL);
-
- tp_clear_object (&contact);
+ empathy_individual_information_dialog_show (individual, NULL);
}
GtkWidget *