Trim trailing white spaces.

[geeqie.git] / src / bar_exif.c

diff --git a/src/bar_exif.c b/src/bar_exif.c
index e07a491..9c1cc47 100644 (file)
--- a/src/bar_exif.c
+++ b/src/bar_exif.c
@@ -257,7 +257,7 @@ static void bar_pane_exif_update(PaneExifData *ped)
 
        ped->all_hidden = TRUE;
 
-       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));    
+       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
        work = list;
        while (work)
                {
@@ -293,7 +293,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
        ped = g_object_get_data(G_OBJECT(bar), "pane_data");
        if (!ped) return FALSE;
 
-       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));    
+       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
        work = list;
        while (!ret && work)
                {
@@ -301,11 +301,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
                ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
                work = work->next;
 
-#if GTK_CHECK_VERSION(2,20,0)
                if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#else
-               if (ee->editable && GTK_WIDGET_HAS_FOCUS(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#endif
                }
        g_list_free(list);
        return ret;
@@ -314,7 +310,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
 static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        PaneExifData *ped = data;
-       if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd) 
+       if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
                {
                DEBUG_1("Notify pane_exif: %s %04x", fd->path, type);
                bar_pane_exif_update(ped);
@@ -389,7 +385,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
                        break;
                }
 
-       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));    
+       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
        work = list;
        pos = 0;
        while (work)
@@ -403,11 +399,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
                
                gtk_widget_get_allocation(entry, &allocation);
                
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_is_drawable(entry) &&
-#else
-               if (GTK_WIDGET_DRAWABLE(entry) && 
-#endif
                    gtk_widget_translate_coordinates(pane, entry, x, y, &nx, &ny) &&
                    ny < allocation.height / 2) break;
                pos++;
@@ -482,7 +474,7 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *gd, gpointer data)
 
        if (ped)
                {
-               bar_pane_exif_add_entry(ped, 
+               bar_pane_exif_add_entry(ped,
                                        gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)),
                                        gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)),
                                        cdd->if_set, cdd->editable);
@@ -635,8 +627,8 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped)
        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
 }
 
-static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) 
-{ 
+static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
        PaneExifData *ped = data;
        if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
@@ -644,7 +636,7 @@ static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent,
                return TRUE;
                }
        return FALSE;
-} 
+}
 
 
 
@@ -676,7 +668,7 @@ static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint in
        WRITE_STRING(">");
        indent++;
        
-       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));    
+       list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
        work = list;
        while (work)
                {
@@ -712,6 +704,7 @@ static void bar_pane_exif_destroy(GtkWidget *widget, gpointer data)
        g_free(ped);
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static void bar_pane_exif_size_request(GtkWidget *pane, GtkRequisition *requisition, gpointer data)
 {
        PaneExifData *ped = data;
@@ -720,11 +713,15 @@ static void bar_pane_exif_size_request(GtkWidget *pane, GtkRequisition *requisit
                requisition->height = ped->min_height;
                }
 }
+#endif
 
 static void bar_pane_exif_size_allocate(GtkWidget *pane, GtkAllocation *alloc, gpointer data)
 {
        PaneExifData *ped = data;
        ped->min_height = alloc->height;
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
+#endif
 }
 
 static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded)
@@ -751,8 +748,12 @@ static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolea
        g_object_set_data(G_OBJECT(ped->widget), "pane_data", ped);
        g_signal_connect_after(G_OBJECT(ped->widget), "destroy",
                               G_CALLBACK(bar_pane_exif_destroy), ped);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
+#else
        g_signal_connect(G_OBJECT(ped->widget), "size-request",
                         G_CALLBACK(bar_pane_exif_size_request), ped);
+#endif
        g_signal_connect(G_OBJECT(ped->widget), "size-allocate",
                         G_CALLBACK(bar_pane_exif_size_allocate), ped);