Add missing vim modeline.

[geeqie.git] / src / bar.c

diff --git a/src/bar.c b/src/bar.c
index 52d6a54..de4270c 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *
@@ -284,9 +284,9 @@ static void bar_menu_popup(GtkWidget *widget)
        else
                {
                expander = widget;
-               bar = widget->parent;
+               bar = gtk_widget_get_parent(widget);
                while (bar && !g_object_get_data(G_OBJECT(bar), "bar_data"))
-                       bar = bar->parent;
+                       bar = gtk_widget_get_parent(bar);
                if (!bar) return;
                }
  
@@ -457,7 +457,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
        if (!bd) return;
 
        WRITE_NL(); WRITE_STRING("<bar ");
-       write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
+       write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
        write_uint_option(outstr, indent, "width", bd->width);
        WRITE_STRING(">");
        
@@ -492,7 +492,7 @@ void bar_update_expander(GtkWidget *pane)
        
        if (!pd) return;
 
-       expander = pane->parent;
+       expander = gtk_widget_get_parent(pane);
        
        gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
 }
@@ -517,7 +517,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
                
        gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
        
-       g_signal_connect(expander, "button_press_event", G_CALLBACK(bar_menu_cb), bd); 
+       g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd); 
        
        gtk_container_add(GTK_CONTAINER(expander), pane);
        
@@ -610,7 +610,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
                         G_CALLBACK(bar_size_allocate), bd);
 
-       g_signal_connect(G_OBJECT(bd->widget), "button_press_event", G_CALLBACK(bar_menu_cb), bd); 
+       g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd); 
 
        bd->width = SIDEBAR_DEFAULT_WIDTH;
        gtk_widget_set_size_request(bd->widget, bd->width, -1);