cleanup desktops.c code

diff --git a/src/desktops.c b/src/desktops.c
index 3d42ac05e2b84afc765ab36a4b32f560eaae7899..ed1ad5e837ed66fe6cf222e10c605a940db8c29e 100644 (file)
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -37,27 +37,23 @@ static void on_desktop_names_cell_edited(GtkCellRendererText *cell,
                                          const gchar *new_text,
                                          gpointer data);
 
-void desktops_setup_num(GtkWidget *w)
-{
-    mapping = TRUE;
-
-    num_desktops = tree_get_int("desktops/number", 4);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), num_desktops);
-
-    mapping = FALSE;
-}
-
-void desktops_setup_names(GtkWidget *w)
+void desktops_setup_tab()
 {
+    GtkWidget *w;
     GtkCellRenderer *render;
     GtkTreeViewColumn *column;
 
     mapping = TRUE;
 
+    w = get_widget("desktop_num");
+    num_desktops = tree_get_int("desktops/number", 4);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), num_desktops);
+
     desktop_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_BOOLEAN);
     gtk_tree_view_set_model(GTK_TREE_VIEW(w), GTK_TREE_MODEL(desktop_store));
     g_object_unref (desktop_store);
 
+    w = get_widget("desktop_names");
     gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(w)),
                                 GTK_SELECTION_SINGLE);
 

diff --git a/src/main.c b/src/main.c
index 38a9498f1199f041de9cf237b3508a63869f017a..4f96ed27ab7b0d38664948d4e70e86acfa30a826 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -168,8 +168,7 @@ int main(int argc, char **argv)
     behavior_setup_resist_edge(get_widget("resist_edge"));
     behavior_setup_resize_contents(get_widget("resize_contents"));
 
-    desktops_setup_num(get_widget("desktop_num"));
-    desktops_setup_names(get_widget("desktop_names"));
+    desktops_setup_tab();
 
     dock_setup_tab();
     dock_setup_position(get_widget("dock_position"));