Trim trailing white spaces.

[geeqie.git] / src / bar_exif.c

diff --git a/src/bar_exif.c b/src/bar_exif.c
index ee6d1df..9c1cc47 100644 (file)
--- a/src/bar_exif.c
+++ b/src/bar_exif.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
  *
@@ -176,7 +176,7 @@ static GtkWidget *bar_pane_exif_add_entry(PaneExifData *ped, const gchar *key, c
        gtk_box_pack_start(GTK_BOX(ped->vbox), ee->ebox, FALSE, FALSE, 0);
 
        bar_pane_exif_entry_dnd_init(ee->ebox);
-       g_signal_connect(ee->ebox, "button_press_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
+       g_signal_connect(ee->ebox, "button_release_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
        
        bar_pane_exif_setup_entry_box(ped, ee);
         
@@ -210,7 +210,7 @@ static void bar_pane_exif_entry_update_title(ExifEntry *ee)
 {
        gchar *markup;
 
-       markup = g_markup_printf_escaped("<span size='small'>%s:</span>", (ee->title) ? ee->title : "fixme");
+       markup = g_markup_printf_escaped("<span size='small'>%s:</span>", (ee->title) ? ee->title : _("<empty label, fixme>"));
        gtk_label_set_markup(GTK_LABEL(ee->title_label), markup);
        g_free(markup);
 }
@@ -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,7 +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 (ee->editable && GTK_WIDGET_HAS_FOCUS(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
+               if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
                }
        g_list_free(list);
        return ret;
@@ -310,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);
@@ -346,7 +346,7 @@ static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *contex
        switch (info)
                {
                case TARGET_APP_EXIF_ENTRY:
-                       gtk_selection_data_set(selection_data, selection_data->target,
+                       gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
                                               8, (gpointer) &entry, sizeof(entry));
                        break;
 
@@ -374,31 +374,34 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
        switch (info)
                {
                case TARGET_APP_EXIF_ENTRY:
-                       new_entry = *(gpointer *)selection_data->data;
+                       new_entry = *(gpointer *)gtk_selection_data_get_data(selection_data);
                        
-                       if (new_entry->parent && new_entry->parent != ped->vbox) bar_pane_exif_reparent_entry(new_entry, pane);
+                       if (gtk_widget_get_parent(new_entry) && gtk_widget_get_parent(new_entry) != ped->vbox) bar_pane_exif_reparent_entry(new_entry, pane);
                        
                        break;
                default:
                        /* FIXME: this needs a check for valid exif keys */
-                       new_entry = bar_pane_exif_add_entry(ped, (gchar *)selection_data->data, NULL, TRUE, FALSE);
+                       new_entry = bar_pane_exif_add_entry(ped, (gchar *)gtk_selection_data_get_data(selection_data), NULL, TRUE, FALSE);
                        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)
                {
                gint nx, ny;
                GtkWidget *entry = work->data;
+               GtkAllocation allocation;
                work = work->next;
                
                if (entry == new_entry) continue;
                
-               if (GTK_WIDGET_DRAWABLE(entry) && 
+               gtk_widget_get_allocation(entry, &allocation);
+               
+               if (gtk_widget_is_drawable(entry) &&
                    gtk_widget_translate_coordinates(pane, entry, x, y, &nx, &ny) &&
-                   ny < entry->allocation.height / 2) break;
+                   ny < allocation.height / 2) break;
                pos++;
                }
        g_list_free(list);
@@ -471,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);
@@ -480,13 +483,13 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *gd, gpointer data)
        if (ee)
                {
                const gchar *title;
-               GtkWidget *pane = cdd->widget->parent;
+               GtkWidget *pane = gtk_widget_get_parent(cdd->widget);
                
                while (pane)
                        {
                        ped = g_object_get_data(G_OBJECT(pane), "pane_data");
                        if (ped) break;
-                       pane = pane->parent;
+                       pane = gtk_widget_get_parent(pane);
                        }
                
                if (!pane) return;
@@ -624,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)
                {
@@ -633,7 +636,7 @@ static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent,
                return TRUE;
                }
        return FALSE;
-} 
+}
 
 
 
@@ -665,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)
                {
@@ -701,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;
@@ -709,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)
@@ -740,13 +748,17 @@ 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);
        
        bar_pane_exif_dnd_init(ped->widget);
-       g_signal_connect(ped->widget, "button_press_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
+       g_signal_connect(ped->widget, "button_release_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
 
        file_data_register_notify_func(bar_pane_exif_notify_cb, ped, NOTIFY_PRIORITY_LOW);