Remove commented out code.

[geeqie.git] / src / layout_config.c

diff --git a/src/layout_config.c b/src/layout_config.c
index 337213d..718bf37 100644 (file)
--- a/src/layout_config.c
+++ b/src/layout_config.c
@@ -1,6 +1,7 @@
 /*
  * Geeqie
  * (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -52,7 +53,7 @@ static LayoutStyle layout_config_styles[] = {
        { LAYOUT_TOP, LAYOUT_LEFT | LAYOUT_BOTTOM, LAYOUT_RIGHT | LAYOUT_BOTTOM }
 };
 
-static gint layout_config_style_count = sizeof(layout_config_styles) / sizeof (LayoutStyle);
+static gint layout_config_style_count = sizeof(layout_config_styles) / sizeof(LayoutStyle);
 
 static gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") };
 
@@ -109,7 +110,7 @@ static void layout_config_list_order_set(LayoutConfig *lc, gint src, gint dest)
 {
        GtkListStore *store;
        GtkTreeIter iter;
-       gint valid;
+       gboolean valid;
        gint n;
 
        store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(lc->listview)));
@@ -132,11 +133,11 @@ static gint layout_config_list_order_get(LayoutConfig *lc, gint n)
 {
        GtkTreeModel *store;
        GtkTreeIter iter;
-       gint valid;
+       gboolean valid;
        gint c = 0;
-                                                                                                                               
+
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(lc->listview));
-                                                                                                                               
+
        valid = gtk_tree_model_get_iter_first(store, &iter);
        while (valid)
                {
@@ -198,7 +199,7 @@ static void layout_config_widget_click_cb(GtkWidget *widget, gpointer data)
        LayoutConfig *lc;
 
        lc = g_object_get_data(G_OBJECT(widget), "layout_config");
-       
+
        if (lc) lc->style = GPOINTER_TO_INT(data);
 }
 
@@ -221,7 +222,7 @@ static void layout_config_table_button(GtkWidget *table, LayoutLocation l, const
 
        button = gtk_button_new_with_label(text);
        gtk_widget_set_sensitive(button, FALSE);
-       GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus(button, FALSE);
        gtk_table_attach_defaults(GTK_TABLE(table), button, x1, x2, y1, y2);
        gtk_widget_show(button);
 }
@@ -259,24 +260,9 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st
        gtk_widget_show(table);
 
        gtk_widget_show(group);
-       
-       return group;
-}
-
-#if 0
-static void layout_config_row_move(GtkWidget *clist, gint source_row, gint dest_row, gpointer data)
-{
-       gchar *text;
-       gint i;
 
-       for (i = 0; i < 3; i++)
-               {
-               text = g_strdup_printf("%d", i + 1);
-               gtk_clist_set_text(GTK_CLIST(clist), i, 0, text);
-               g_free(text);
-               }
+       return group;
 }
-#endif
 
 static void layout_config_number_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
                                    GtkTreeModel *store, GtkTreeIter *iter, gpointer data)
@@ -356,16 +342,16 @@ GtkWidget *layout_config_new(void)
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, COLUMN_TEXT, _(layout_titles[i]), COLUMN_KEY, i, -1);
                }
-       
+
        gtk_container_add(GTK_CONTAINER(scrolled), lc->listview);
        gtk_widget_show(lc->listview);
 
        pref_label_new(lc->box, _("(drag to change order)"));
-       
+
        return lc->box;
 }
 
-static char num_to_text_char(gint n)
+static gchar num_to_text_char(gint n)
 {
        switch (n)
                {
@@ -414,5 +400,4 @@ void layout_config_order_from_text(const gchar *text, gint *a, gint *b, gint *c)
                *c = text_char_to_num(text, 2);
                }
 }
-
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */