diff options
Diffstat (limited to 'megaphone/src/megaphone-applet.c')
| -rw-r--r-- | megaphone/src/megaphone-applet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c index 7350c1873..c269c7c7d 100644 --- a/megaphone/src/megaphone-applet.c +++ b/megaphone/src/megaphone-applet.c @@ -197,7 +197,7 @@ megaphone_applet_new_connection_cb (EmpathyAccountManager *manager, { MegaphoneAppletPriv *priv = GET_PRIV (applet); - if (priv->contact || !empathy_account_equal (account, priv->account)) { + if (priv->contact || account != priv->account) { return; } @@ -280,7 +280,7 @@ megaphone_applet_show_preferences (MegaphoneApplet *applet) gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 500); scroll = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (contact_list)); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scroll); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll); gtk_widget_show (scroll); g_object_set_data (G_OBJECT (dialog), "contact-list", contact_list); @@ -443,7 +443,7 @@ megaphone_applet_set_contact (MegaphoneApplet *applet, /* Lookup the new contact */ if (str) { strv = g_strsplit (str, "/", 2); - priv->account = empathy_account_manager_lookup (priv->account_manager, + priv->account = empathy_account_manager_get_account (priv->account_manager, strv[0]); priv->id = strv[1]; g_free (strv[0]); @@ -451,6 +451,7 @@ megaphone_applet_set_contact (MegaphoneApplet *applet, } if (priv->account) { + g_object_ref (priv->account); connection = empathy_account_get_connection (priv->account); if (connection) { megaphone_applet_new_connection_cb (priv->account_manager, |