#include "empathy-contact-dialogs.h"
#include "empathy-contact-widget.h"
-#include "gossip-ui-utils.h"
+#include "empathy-ui-utils.h"
-static GHashTable *subscription_dialogs = NULL;
-static GHashTable *information_dialogs = NULL;
+static GList *subscription_dialogs = NULL;
+static GList *information_dialogs = NULL;
+static GtkWidget *new_contact_dialog = NULL;
+
+
+static gint
+contact_dialogs_find (GtkDialog *dialog,
+ EmpathyContact *contact)
+{
+ GtkWidget *contact_widget;
+ EmpathyContact *this_contact;
+
+ contact_widget = g_object_get_data (G_OBJECT (dialog), "contact_widget");
+ this_contact = empathy_contact_widget_get_contact (contact_widget);
+
+ return !empathy_contact_equal (contact, this_contact);
+}
/*
* Subscription dialog
GtkWidget *contact_widget)
{
EmpathyContactManager *manager;
- GossipContact *contact;
+ EmpathyContact *contact;
manager = empathy_contact_manager_new ();
contact = empathy_contact_widget_get_contact (contact_widget);
- empathy_contact_widget_save (contact_widget);
if (response == GTK_RESPONSE_YES) {
- empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
- contact,
- _("I would like to add you to my contact list."));
+ empathy_contact_list_process_pending (EMPATHY_CONTACT_LIST (manager),
+ contact, TRUE);
}
else if (response == GTK_RESPONSE_NO) {
- empathy_contact_list_remove (EMPATHY_CONTACT_LIST (manager),
- contact,
- _("Sorry, I don't want you in my contact list."));
+ empathy_contact_list_process_pending (EMPATHY_CONTACT_LIST (manager),
+ contact, FALSE);
}
- g_hash_table_remove (subscription_dialogs, contact);
+ subscription_dialogs = g_list_remove (subscription_dialogs, dialog);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (manager);
}
void
-empathy_subscription_dialog_show (GossipContact *contact,
+empathy_subscription_dialog_show (EmpathyContact *contact,
GtkWindow *parent)
{
GtkWidget *dialog;
GtkWidget *hbox_subscription;
GtkWidget *contact_widget;
+ GList *l;
- g_return_if_fail (GOSSIP_IS_CONTACT (contact));
-
- if (!subscription_dialogs) {
- subscription_dialogs = g_hash_table_new_full (gossip_contact_hash,
- gossip_contact_equal,
- (GDestroyNotify) g_object_unref,
- (GDestroyNotify) gtk_widget_destroy);
- }
+ g_return_if_fail (EMPATHY_IS_CONTACT (contact));
- dialog = g_hash_table_lookup (subscription_dialogs, contact);
- if (dialog) {
- gtk_window_present (GTK_WINDOW (dialog));
+ l = g_list_find_custom (subscription_dialogs,
+ contact,
+ (GCompareFunc) contact_dialogs_find);
+ if (l) {
+ gtk_window_present (GTK_WINDOW (l->data));
return;
}
- gossip_glade_get_file_simple ("empathy-contact-dialogs.glade",
+ empathy_glade_get_file_simple ("empathy-contact-dialogs.glade",
"subscription_request_dialog",
NULL,
"subscription_request_dialog", &dialog,
"hbox_subscription", &hbox_subscription,
NULL);
- g_hash_table_insert (subscription_dialogs, g_object_ref (contact), dialog);
-
- contact_widget = empathy_contact_widget_new (contact, TRUE);
+ contact_widget = empathy_contact_widget_new (contact,
+ CONTACT_WIDGET_TYPE_SUBSCRIPTION);
gtk_box_pack_end (GTK_BOX (hbox_subscription),
contact_widget,
TRUE, TRUE,
0);
+ g_object_set_data (G_OBJECT (dialog), "contact_widget", contact_widget);
+ subscription_dialogs = g_list_prepend (subscription_dialogs, dialog);
+
g_signal_connect (dialog, "response",
G_CALLBACK (subscription_dialog_response_cb),
contact_widget);
gint response,
GtkWidget *contact_widget)
{
- GossipContact *contact;
+ information_dialogs = g_list_remove (information_dialogs, dialog);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+void
+empathy_contact_information_dialog_show (EmpathyContact *contact,
+ GtkWindow *parent,
+ gboolean edit)
+{
+ GtkWidget *dialog;
+ GtkWidget *button;
+ GtkWidget *contact_widget;
+ GList *l;
+ EmpathyContactWidgetType type;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
+ l = g_list_find_custom (information_dialogs,
+ contact,
+ (GCompareFunc) contact_dialogs_find);
+ if (l) {
+ gtk_window_present (GTK_WINDOW (l->data));
+ return;
+ }
+
+ type = edit ? CONTACT_WIDGET_TYPE_EDIT : CONTACT_WIDGET_TYPE_SHOW;
+
+ /* Create dialog */
+ dialog = gtk_dialog_new ();
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Contact information"));
+
+ /* 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_show (button);
+
+ /* Contact info widget */
+ contact_widget = empathy_contact_widget_new (contact, type);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ contact_widget,
+ TRUE, TRUE, 0);
+
+ g_object_set_data (G_OBJECT (dialog), "contact_widget", contact_widget);
+ information_dialogs = g_list_prepend (information_dialogs, dialog);
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (contact_information_response_cb),
+ contact_widget);
+
+ if (parent) {
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+ }
+
+ gtk_widget_show (dialog);
+}
+
+/*
+ * New contact dialog
+ */
+
+static void
+new_contact_response_cb (GtkDialog *dialog,
+ gint response,
+ GtkWidget *contact_widget)
+{
+ EmpathyContactManager *manager;
+ EmpathyContact *contact;
+ manager = empathy_contact_manager_new ();
contact = empathy_contact_widget_get_contact (contact_widget);
- empathy_contact_widget_save (contact_widget);
- g_hash_table_remove (information_dialogs, contact);
+ if (contact && response == GTK_RESPONSE_OK) {
+ empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
+ contact,
+ _("I would like to add you to my contact list."));
+ }
+
+ new_contact_dialog = NULL;
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ g_object_unref (manager);
}
void
-empathy_contact_information_dialog_show (GossipContact *contact,
- GtkWindow *parent,
- gboolean edit)
+empathy_new_contact_dialog_show (GtkWindow *parent)
{
GtkWidget *dialog;
GtkWidget *button;
GtkWidget *contact_widget;
- g_return_if_fail (GOSSIP_IS_CONTACT (contact));
-
- if (!information_dialogs) {
- information_dialogs = g_hash_table_new_full (gossip_contact_hash,
- gossip_contact_equal,
- (GDestroyNotify) g_object_unref,
- (GDestroyNotify) gtk_widget_destroy);
- }
-
- dialog = g_hash_table_lookup (information_dialogs, contact);
- if (dialog) {
- gtk_window_present (GTK_WINDOW (dialog));
+ if (new_contact_dialog) {
+ gtk_window_present (GTK_WINDOW (new_contact_dialog));
return;
}
+ /* Create dialog */
dialog = gtk_dialog_new ();
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
- if (edit) {
- /* Cancel button */
- button = gtk_button_new_with_label (GTK_STOCK_CANCEL);
- gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
- button,
- GTK_RESPONSE_CANCEL);
- gtk_widget_show (button);
-
- button = gtk_button_new_with_label (GTK_STOCK_SAVE);
- gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
- button,
- GTK_RESPONSE_OK);
- gtk_widget_show (button);
- } else {
- /* 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_show (button);
- }
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New contact"));
+
+ /* Cancel button */
+ button = gtk_button_new_with_label (GTK_STOCK_CANCEL);
+ gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
+ button,
+ GTK_RESPONSE_CANCEL);
+ gtk_widget_show (button);
- contact_widget = empathy_contact_widget_new (contact, edit);
+ /* Add button */
+ button = gtk_button_new_with_label (GTK_STOCK_ADD);
+ gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
+ button,
+ GTK_RESPONSE_OK);
+ gtk_widget_show (button);
+
+ /* Contact info widget */
+ contact_widget = empathy_contact_widget_new (NULL, CONTACT_WIDGET_TYPE_ADD);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
contact_widget,
TRUE, TRUE, 0);
+ new_contact_dialog = dialog;
+
g_signal_connect (dialog, "response",
- G_CALLBACK (contact_information_response_cb),
+ G_CALLBACK (new_contact_response_cb),
contact_widget);
- g_hash_table_insert (information_dialogs, g_object_ref (contact), dialog);
-
if (parent) {
gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
}
projects / empathy.git / blobdiff