From fa1ab50697f78108c7fcf6a6df49330a7e983b07 Mon Sep 17 00:00:00 2001
From: Brian Tarricone <brian@tarricone.org>
Date: Mon, 29 Sep 2008 06:19:02 +0000
Subject: [PATCH] fix typo that causes new workspace name to be shown
 incorrectly in the dialog

(Old svn revision: 27983)
---
 settings-dialogs/workspace-settings.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c
index d2fb6f7a1..6458bf22b 100644
--- a/settings-dialogs/workspace-settings.c
+++ b/settings-dialogs/workspace-settings.c
@@ -127,6 +127,7 @@ treeview_ws_names_row_activated(GtkTreeView *treeview,
 
     gtk_tree_model_get(model, &iter,
                        COL_NUMBER, &ws_num,
+                       COL_NAME, &old_name,
                        -1);
 
     subtitle = g_strdup_printf(_("Change the name of workspace %d"), ws_num);
@@ -134,9 +135,6 @@ treeview_ws_names_row_activated(GtkTreeView *treeview,
     g_free(subtitle);
 
     entry = g_object_get_data(G_OBJECT(dialog), "name-entry");
-    gtk_tree_model_get(model, &iter,
-                       COL_NAME, &old_name,
-                       -1);
     gtk_entry_set_text(GTK_ENTRY(entry), old_name);
     gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
 
@@ -152,7 +150,7 @@ treeview_ws_names_row_activated(GtkTreeView *treeview,
         /* only update it if the name's actually different */
         if(strcmp(old_name, new_name)) {
             gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                               COL_NAME, &new_name,
+                               COL_NAME, new_name,
                                -1);
             workspace_names_update_xfconf(ws_num - 1, new_name);
         }
-- 
GitLab