From 9b845e9ce1fe88006335f73a02ff68853757bd30 Mon Sep 17 00:00:00 2001 From: Jonathan Tellier Date: Fri, 28 Aug 2009 11:06:14 -0400 Subject: Simplified the code that checks if selected account has pending changes --- src/empathy-accounts-dialog.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/empathy-accounts-dialog.c') diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 807c78b97..6cfc830d1 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -342,22 +342,18 @@ accounts_dialog_has_pending_change (EmpathyAccountsDialog *dialog, gboolean has_pending_changes; GtkTreeIter iter; GtkTreeModel *model; - EmpathyAccountSettings *settings; + GtkTreeSelection *selection; EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview)); - settings = accounts_dialog_model_get_selected_settings (dialog); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); - if (accounts_dialog_get_settings_iter (dialog, settings, &iter)) + if (gtk_tree_selection_get_selected (selection, &model, &iter)) gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, account, -1); has_pending_changes = account != NULL && priv->setting_widget_object != NULL && empathy_account_widget_contains_pending_changes ( priv->setting_widget_object); - if (settings != NULL) - g_object_unref (settings); - return has_pending_changes; } -- cgit v1.2.3