Renamed empathy_account_chooser_get_account to empathy_account_chooser_dup_account...

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index ea3d6e513745b978d014c06d134abd8c1abb9e9b..859ba33537eb2e4b66377fc63fb9160463179f04 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -220,7 +220,7 @@ empathy_account_chooser_new (void)
 }
 
 McAccount *
 }
 
 McAccount *

-empathy_account_chooser_get_account (EmpathyAccountChooser *chooser)
+empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)

 {
        EmpathyAccountChooserPriv *priv;
        McAccount                *account;
 {
        EmpathyAccountChooserPriv *priv;
        McAccount                *account;


@@ -252,7 +252,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 
        priv = GET_PRIV (chooser);
 
 
        priv = GET_PRIV (chooser);
 

-       account = empathy_account_chooser_get_account (chooser);
+       account = empathy_account_chooser_dup_account (chooser);

        connection = empathy_account_manager_get_connection (priv->manager, account);
        g_object_unref (account);
 
        connection = empathy_account_manager_get_connection (priv->manager, account);
        g_object_unref (account);
 

diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 4dfdc632ec60330746a96d7367ae02914b2c0738..580c216958af1a2075c4770c1832933f7ac7b749 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -56,7 +56,7 @@ struct _EmpathyAccountChooserClass {
 
 GType          empathy_account_chooser_get_type           (void) G_GNUC_CONST;
 GtkWidget *    empathy_account_chooser_new                (void);
 
 GType          empathy_account_chooser_get_type           (void) G_GNUC_CONST;
 GtkWidget *    empathy_account_chooser_new                (void);

-McAccount *    empathy_account_chooser_get_account        (EmpathyAccountChooser *chooser);
+McAccount *    empathy_account_chooser_dup_account        (EmpathyAccountChooser *chooser);

 TpConnection * empathy_account_chooser_get_connection     (EmpathyAccountChooser *chooser);
 gboolean       empathy_account_chooser_set_account        (EmpathyAccountChooser *chooser,
                                                           McAccount            *account);
 TpConnection * empathy_account_chooser_get_connection     (EmpathyAccountChooser *chooser);
 gboolean       empathy_account_chooser_set_account        (EmpathyAccountChooser *chooser,
                                                           McAccount            *account);

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 2cec17783c52c962b06e170900f430d566993273..13d9bcbd34536181438354f610f369f949a4c473 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -618,7 +618,7 @@ log_window_chats_populate (EmpathyLogWindow *window)
        GtkTreeIter           iter;
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);
        GtkTreeIter           iter;
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);

-       account = empathy_account_chooser_get_account (account_chooser);
+       account = empathy_account_chooser_dup_account (account_chooser);

 
        view = GTK_TREE_VIEW (window->treeview_chats);
        model = gtk_tree_view_get_model (view);
 
        view = GTK_TREE_VIEW (window->treeview_chats);
        model = gtk_tree_view_get_model (view);

diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index acd559e5f03c0497d1f934a067bebe09874db984..fa63d5a514e044ce7d1856eea124c888d16e453f 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -318,7 +318,7 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
 
        /* Look up chatrooms */
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
 
        /* Look up chatrooms */
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);

-       account = empathy_account_chooser_get_account (account_chooser);
+       account = empathy_account_chooser_dup_account (account_chooser);

 
        chatrooms = empathy_chatroom_manager_get_chatrooms (window->manager, account);
 
 
        chatrooms = empathy_chatroom_manager_get_chatrooms (window->manager, account);
 


@@ -509,7 +509,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
        McAccount            *account;
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
        McAccount            *account;
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);

-       account = empathy_account_chooser_get_account (account_chooser);
+       account = empathy_account_chooser_dup_account (account_chooser);

 
        if (!account) {
                chatrooms_window_model_add (window, chatroom, FALSE);
 
        if (!account) {
                chatrooms_window_model_add (window, chatroom, FALSE);

diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index abfdcf0acefa32de6f5d5a5817f61f6eeeb33add..837d9acfe466ad889d4a82f16b2948b8affdb2ee 100644 (file)
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -342,7 +342,7 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
        const gchar           *room;
        
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
        const gchar           *room;
        
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);

-       account = empathy_account_chooser_get_account (account_chooser);
+       account = empathy_account_chooser_dup_account (account_chooser);

        profile = mc_account_get_profile (account);
        protocol = mc_profile_get_protocol_name (profile);
 
        profile = mc_account_get_profile (account);
        protocol = mc_profile_get_protocol_name (profile);
 


@@ -388,7 +388,7 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
        new_chatroom_dialog_model_clear (dialog);
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
        new_chatroom_dialog_model_clear (dialog);
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);

-       account = empathy_account_chooser_get_account (account_chooser);
+       account = empathy_account_chooser_dup_account (account_chooser);

        dialog->room_list = empathy_tp_roomlist_new (account);
 
        if (dialog->room_list) {
        dialog->room_list = empathy_tp_roomlist_new (account);
 
        if (dialog->room_list) {


@@ -409,6 +409,8 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
        }
 
        new_chatroom_dialog_update_widgets (dialog);
        }
 
        new_chatroom_dialog_update_widgets (dialog);

+
+       g_object_unref (account);

 }
 
 static void
 }
 
 static void