Trim trailing white spaces.

[geeqie.git] / src / ui_bookmark.c

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index 0f392b5..e000a1d 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -485,7 +485,7 @@ static void bookmark_drag_set_data(GtkWidget *button,
 
        gchar **uris = uris_from_filelist(list);
        gboolean ret = gtk_selection_data_set_uris(selection_data, uris);
-       if (!ret) 
+       if (!ret)
                {
                char *str = g_strjoinv("\r\n", uris);
                ret = gtk_selection_data_set_text(selection_data, str, -1);
@@ -505,9 +505,13 @@ static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpoi
        
        gtk_widget_get_allocation(button, &allocation);
 
+#if GTK_CHECK_VERSION(3,0,0)
+       pixbuf = gdk_pixbuf_get_from_window(gtk_widget_get_window(button),
+                                           allocation.x, allocation.y,
+                                           allocation.width, allocation.height);
+#else
        pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
                                allocation.width, allocation.height);
-#if !GTK_CHECK_VERSION(3,0,0)
        gdk_pixbuf_get_from_drawable(pixbuf, gtk_widget_get_window(button), NULL,
                                     allocation.x, allocation.y,
                                     0, 0, allocation.width, allocation.height);
@@ -871,10 +875,6 @@ GtkWidget *history_combo_new(GtkWidget **entry, const gchar *text,
        hc->history_levels = max_levels;
 
        hc->combo = gtk_combo_box_text_new_with_entry();
-#if 0
-       gtk_combo_set_case_sensitive(GTK_COMBO(hc->combo), TRUE);
-       gtk_combo_set_use_arrows(GTK_COMBO(hc->combo), FALSE);
-#endif
 
        hc->entry = gtk_bin_get_child(GTK_BIN(hc->combo));