Remove commented out code.

[geeqie.git] / src / preferences.c

diff --git a/src/preferences.c b/src/preferences.c
index d0f4d1b..dad1bf8 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -216,6 +216,7 @@ static void config_window_apply(void)
        options->image.max_window_size = c_options->image.max_window_size;
        options->image.limit_autofit_size = c_options->image.limit_autofit_size;
        options->image.max_autofit_size = c_options->image.max_autofit_size;
+       options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
        options->progressive_key_scrolling = c_options->progressive_key_scrolling;
        if (options->thumbnails.max_width != c_options->thumbnails.max_width
            || options->thumbnails.max_height != c_options->thumbnails.max_height
@@ -285,6 +286,7 @@ static void config_window_apply(void)
 
        options->update_on_time_change = c_options->update_on_time_change;
        options->image.exif_rotate_enable = c_options->image.exif_rotate_enable;
+       options->image.exif_proof_rotate_enable = c_options->image.exif_proof_rotate_enable;
 
        options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold;
 
@@ -988,7 +990,6 @@ static void image_overlay_help_cb(GtkWidget *widget, gpointer data)
        help_window_show("overlay");
 }
 
-#if GTK_CHECK_VERSION(2, 10, 0)
 static void accel_store_populate(void)
 {
        LayoutWindow *lw;
@@ -1285,7 +1286,6 @@ static void accel_default_ok_cb(GenericDialog *gd, gpointer data)
        accel_store_populate();
 }
 
-#endif
 #endif
 
 static GtkWidget *scrolled_notebook_page(GtkWidget *notebook, const gchar *title)
@@ -1404,6 +1404,11 @@ static void config_tab_image(GtkWidget *notebook)
        table = pref_table_new(group, 2, 1, FALSE, FALSE);
        add_quality_menu(table, 0, 0, _("Quality:"), options->image.zoom_quality, &c_options->image.zoom_quality);
 
+#ifdef HAVE_CLUTTER
+       pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library"),
+                             options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
+#endif
+
        pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
                              options->image.zoom_2pass, &c_options->image.zoom_2pass);
 
@@ -1466,6 +1471,9 @@ static void config_tab_image(GtkWidget *notebook)
 
        pref_checkbox_new_int(group, _("Auto rotate image using Exif information"),
                              options->image.exif_rotate_enable, &c_options->image.exif_rotate_enable);
+
+       pref_checkbox_new_int(group, _("Auto rotate proofs using Exif information"),
+                             options->image.exif_proof_rotate_enable, &c_options->image.exif_proof_rotate_enable);
 }
 
 /* windows tab */
@@ -1531,7 +1539,6 @@ static void config_tab_windows(GtkWidget *notebook)
 
        image_overlay_template_view = gtk_text_view_new();
 
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_widget_set_tooltip_markup(image_overlay_template_view,
        _("<i>%name%</i> results in the filename of the picture.\n"
          "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>%date%</i>,\n"
@@ -1543,8 +1550,7 @@ static void config_tab_windows(GtkWidget *notebook)
          "<i>%formatted.ShutterSpeed%</i>|<i>%formatted.ISOSpeedRating%</i>|<i>%formatted.FocalLength%</i> could show \"1/20s - 400 - 80 mm\" or \"1/200 - 80 mm\",\n"
          "if there's no ISO information in the Exif data.\n"
          "If a line is empty, it is removed. This allows one to add lines that totally disappear when no data is available.\n"
-));
-#endif
+       ));
        gtk_container_add(GTK_CONTAINER(scrolled), image_overlay_template_view);
        gtk_widget_show(image_overlay_template_view);
 
@@ -1953,9 +1959,7 @@ static void config_tab_behavior(GtkWidget *notebook)
        pref_spacer(hbox, PREF_PAD_INDENT - PREF_PAD_GAP);
        spin = pref_spin_new_int(hbox, _("Maximum size:"), _("MB"),
                                 0, 2048, 1, options->file_ops.safe_delete_folder_maxsize, &c_options->file_ops.safe_delete_folder_maxsize);
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_widget_set_tooltip_markup(spin, _("Set to 0 for unlimited size"));
-#endif
        button = pref_button_new(NULL, NULL, _("View"), FALSE,
                                 G_CALLBACK(safe_delete_view_cb), NULL);
        gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2008,7 +2012,6 @@ static void config_tab_behavior(GtkWidget *notebook)
 /* accelerators tab */
 static void config_tab_accelerators(GtkWidget *notebook)
 {
-#if GTK_CHECK_VERSION(2, 10, 0)
        GtkWidget *hbox;
        GtkWidget *vbox;
        GtkWidget *group;
@@ -2122,7 +2125,6 @@ static void config_tab_accelerators(GtkWidget *notebook)
        gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 #endif
-#endif
 }
 
 /* stereo tab */