Tidy up.

diff --git a/src/advanced_exif.c b/src/advanced_exif.c
index e762ae9..870e557 100644 (file)
--- a/src/advanced_exif.c
+++ b/src/advanced_exif.c
@@ -58,7 +58,7 @@ enum {
        EXIF_ADVCOL_COUNT
 };
 
-static gint advanced_exif_row_enabled(const gchar *name)
+static gboolean advanced_exif_row_enabled(const gchar *name)
 {
        GList *list;
 
@@ -230,10 +230,10 @@ static gint n_exif_drag_types = 1;
 
 
 static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
-                                    GtkSelectionData *selection_data, guint info,
-                                    guint time, gpointer data)
+                                 GtkSelectionData *selection_data, guint info,
+                                 guint time, gpointer data)
 {
-       ExifWin *ew = data;
+       //ExifWin *ew = data;
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); 
        GtkTreeIter iter;
 
@@ -244,7 +244,7 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
 
                gtk_tree_model_get(store, &iter, EXIF_ADVCOL_NAME, &key, -1);
                gtk_selection_data_set_text(selection_data, key, -1);
-               printf("%s\n",key);
+               //printf("%s\n",key);
                g_free(key);
                }
 
@@ -253,7 +253,7 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
 
 static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer data)
 {
-       ExifWin *ew = data;
+       //ExifWin *ew = data;
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); 
        GtkTreeIter iter;
 
@@ -271,7 +271,7 @@ static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context
 
 
 
-static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gint n, gint sizable)
+static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gint n, gboolean sizable)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;

diff --git a/src/bar.c b/src/bar.c
index 46daef7..23c44be 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -51,6 +51,7 @@ static void bar_expander_move(GtkWidget *widget, gpointer data, gboolean up)
        GtkWidget *expander = data;
        GtkWidget *box;
        gint pos;
+
        if (!expander) return;
        box = gtk_widget_get_ancestor(expander, GTK_TYPE_BOX);
        if (!box) return;
@@ -121,11 +122,12 @@ void bar_set_fd(GtkWidget *bar, FileData *fd)
 
 }
 
-gint bar_event(GtkWidget *bar, GdkEvent *event)
+gboolean bar_event(GtkWidget *bar, GdkEvent *event)
 {
        BarData *bd;
        GList *list, *work;
-       gint ret = FALSE;
+       gboolean ret = FALSE;
+       
        bd = g_object_get_data(G_OBJECT(bar), "bar_data");
        if (!bd) return FALSE;
 
@@ -153,7 +155,9 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
 {
        BarData *bd;
        GList *list, *work;
+
        if (!bar) return;
+       
        bd = g_object_get_data(G_OBJECT(bar), "bar_data");
        if (!bd) return;
 
@@ -191,7 +195,6 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
        GtkWidget *expander;
        BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
        PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
-
        
        if (!bd) return;
 
@@ -222,6 +225,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
 static void bar_populate_default(GtkWidget *bar)
 {
        GtkWidget *widget;
+       
        widget = bar_pane_histogram_new(_("Histogram"), 80, TRUE, HCHAN_RGB, 0);
        bar_add(bar, widget);
 
@@ -247,8 +251,11 @@ static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpoi
 
 gint bar_get_width(GtkWidget *bar)
 {
-       BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       BarData *bd;
+       
+       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
        if (!bd) return 0;
+
        return bd->width;
 }
 

diff --git a/src/bar.h b/src/bar.h
index d246dba..3a6408a 100644 (file)
--- a/src/bar.h
+++ b/src/bar.h
@@ -43,7 +43,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane);
 
 
 void bar_set_fd(GtkWidget *bar, FileData *fd);
-gint bar_event(GtkWidget *bar, GdkEvent *event);
+gboolean bar_event(GtkWidget *bar, GdkEvent *event);
 
 gint bar_get_width(GtkWidget *bar);