Include a Other Software section in Help file

[geeqie.git] / src / layout_config.c

diff --git a/src/layout_config.c b/src/layout_config.c
index 7899ea1..77185c1 100644 (file)
--- a/src/layout_config.c
+++ b/src/layout_config.c
@@ -1,13 +1,22 @@
 /*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "main.h"
@@ -110,7 +119,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)));
@@ -133,7 +142,7 @@ 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));
@@ -222,7 +231,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);
 }
@@ -264,21 +273,6 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st
        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);
-               }
-}
-#endif
-
 static void layout_config_number_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
                                    GtkTreeModel *store, GtkTreeIter *iter, gpointer data)
 {