aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--libempathy-gtk/empathy-accounts-dialog.c12
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b8b47b81..823686e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-10-19 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/empathy-accounts-dialog.c: Update Enable/Disable
+ button when "account-enabled" or "account-disabled" are emitted on
+ McAccountMonitor. Set tooltip on protocol icon with the profile's
+ display name.
+
+2007-10-19 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-profile-chooser.c:
* libempathy-gtk/empathy-profile-chooser.h:
* libempathy-gtk/empathy-accounts-dialog.c: set unsensitive the add
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
index 914e6d471..e5635836e 100644
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/libempathy-gtk/empathy-accounts-dialog.c
@@ -322,10 +322,8 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image_type),
mc_profile_get_icon_name (profile),
GTK_ICON_SIZE_DIALOG);
- /* FIXME: Uncomment once we depend on GTK+ 2.12
gtk_widget_set_tooltip_text (dialog->image_type,
mc_profile_get_display_name (profile));
- */
text = g_strdup_printf ("<big><b>%s</b></big>", mc_account_get_display_name (account));
gtk_label_set_markup (GTK_LABEL (dialog->label_name), text);
@@ -962,6 +960,9 @@ accounts_dialog_destroy_cb (GtkWidget *widget,
g_signal_handlers_disconnect_by_func (dialog->monitor,
accounts_dialog_account_removed_cb,
dialog);
+ g_signal_handlers_disconnect_by_func (dialog->monitor,
+ accounts_dialog_update_connect_button,
+ dialog);
dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (dialog->mc),
"AccountStatusChanged",
G_CALLBACK (accounts_dialog_status_changed_cb),
@@ -1061,13 +1062,18 @@ empathy_accounts_dialog_show (GtkWindow *parent)
dialog->mc = empathy_mission_control_new ();
dialog->monitor = mc_account_monitor_new ();
- /* FIXME: connect account-enabled/disabled too */
g_signal_connect (dialog->monitor, "account-created",
G_CALLBACK (accounts_dialog_account_added_cb),
dialog);
g_signal_connect (dialog->monitor, "account-deleted",
G_CALLBACK (accounts_dialog_account_removed_cb),
dialog);
+ g_signal_connect_swapped (dialog->monitor, "account-enabled",
+ G_CALLBACK (accounts_dialog_update_connect_button),
+ dialog);
+ g_signal_connect_swapped (dialog->monitor, "account-disabled",
+ G_CALLBACK (accounts_dialog_update_connect_button),
+ dialog);
dbus_g_proxy_connect_signal (DBUS_G_PROXY (dialog->mc), "AccountStatusChanged",
G_CALLBACK (accounts_dialog_status_changed_cb),
dialog, NULL);