Mercurial > geeqie
diff src/bar.c @ 1417:8036c5b779ca
Tidy up.
author | zas_ |
---|---|
date | Wed, 11 Mar 2009 23:04:30 +0000 |
parents | c44f21235ffe |
children | e015b6573d36 |
line wrap: on
line diff
--- a/src/bar.c Wed Mar 11 22:56:56 2009 +0000 +++ b/src/bar.c Wed Mar 11 23:04:30 2009 +0000 @@ -51,6 +51,7 @@ 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 @@ } -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 @@ { 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 @@ 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 @@ 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 @@ 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; }