diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-07-26 22:27:45 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-07-26 22:27:45 +0800 |
| commit | bc51bf4283ead42b56ddcd174d3273b446ac4aa4 (patch) | |
| tree | 0c13a5b7b0cc6e8a678db595e6b79eb2d46ffa25 /libempathy-gtk/empathy-contact-dialogs.c | |
| parent | 7907c710253ba70cf1b3f475a1f7be79d0e3f546 (diff) | |
| download | gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar.gz gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar.bz2 gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar.lz gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar.xz gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.tar.zst gsoc2013-empathy-bc51bf4283ead42b56ddcd174d3273b446ac4aa4.zip | |
Do not show salut accounts in the add contact dialog. Rework a bit
2007-07-26 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-account-chooser.c:
* libempathy-gtk/empathy-new-chatroom-dialog.c:
* libempathy-gtk/empathy-account-chooser.h:
* libempathy-gtk/empathy-contact-dialogs.c:
* libempathy-gtk/empathy-chatrooms-window.c:
* libempathy-gtk/empathy-contact-widget.c:
* libempathy-gtk/empathy-contact-widget.h:
* libempathy-gtk/empathy-log-window.c:
* doc/*: Do not show salut accounts in the add contact dialog. Rework
a bit EmpathyContactWidget. Fixes bug #459100
(Guillaume Desmottes, Xavier Claessens).
svn path=/trunk/; revision=197
Diffstat (limited to 'libempathy-gtk/empathy-contact-dialogs.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index b0d24decc..437e255fa 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -109,7 +109,8 @@ empathy_subscription_dialog_show (EmpathyContact *contact, "hbox_subscription", &hbox_subscription, NULL); - 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, @@ -144,13 +145,14 @@ contact_information_response_cb (GtkDialog *dialog, void empathy_contact_information_dialog_show (EmpathyContact *contact, - GtkWindow *parent, - gboolean edit) + GtkWindow *parent, + gboolean edit) { - GtkWidget *dialog; - GtkWidget *button; - GtkWidget *contact_widget; - GList *l; + GtkWidget *dialog; + GtkWidget *button; + GtkWidget *contact_widget; + GList *l; + EmpathyContactWidgetType type; g_return_if_fail (EMPATHY_IS_CONTACT (contact)); @@ -162,6 +164,8 @@ empathy_contact_information_dialog_show (EmpathyContact *contact, 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); @@ -176,8 +180,8 @@ empathy_contact_information_dialog_show (EmpathyContact *contact, GTK_RESPONSE_CLOSE); gtk_widget_show (button); - /* Contact infor widget */ - contact_widget = empathy_contact_widget_new (contact, edit); + /* 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); @@ -256,8 +260,8 @@ empathy_new_contact_dialog_show (GtkWindow *parent) GTK_RESPONSE_OK); gtk_widget_show (button); - /* Contact infor widget */ - contact_widget = empathy_contact_widget_new (NULL, TRUE); + /* 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); |