[Xfce4-commits] <ristretto:ristretto-0.0> - Fix compile warning - Save paned position for thumbnailbar-size

Stephan Arts noreply at xfce.org
Sun Oct 23 19:26:13 CEST 2011


Updating branch refs/heads/ristretto-0.0
         to f7d4828aee88787aa5c996a5425e0dd107c7a46e (commit)
       from 1f9a15efbec66c43b4b638dad75e3767266719fe (commit)

commit f7d4828aee88787aa5c996a5425e0dd107c7a46e
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Jul 12 11:13:22 2010 +0200

    - Fix compile warning
    - Save paned position for thumbnailbar-size

 po/ristretto.pot  |  536 -----------------------------------------------------
 src/main_window.c |   45 +++++-
 src/settings.c    |   51 +++++
 src/settings.h    |    2 +
 src/thumbnailer.c |    6 +-
 5 files changed, 100 insertions(+), 540 deletions(-)

diff --git a/po/ristretto.pot b/po/ristretto.pot
deleted file mode 100644
index 83c51a9..0000000
--- a/po/ristretto.pot
+++ /dev/null
@@ -1,536 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2010-01-15 00:57+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/main.c:59
-msgid "Version information"
-msgstr ""
-
-#: ../src/main.c:63
-msgid "Start in fullscreen mode"
-msgstr ""
-
-#: ../src/main.c:67
-msgid "Start a slideshow"
-msgstr ""
-
-#: ../src/main.c:91
-#, c-format
-msgid ""
-"%s: %s\n"
-"Try %s --help to see a full list of available command line options.\n"
-msgstr ""
-
-#. File Menu
-#: ../src/main_window.c:262
-msgid "_File"
-msgstr ""
-
-#: ../src/main_window.c:263
-msgid "_Open"
-msgstr ""
-
-#: ../src/main_window.c:263
-msgid "Open an image"
-msgstr ""
-
-#: ../src/main_window.c:264
-msgid "Open _Folder"
-msgstr ""
-
-#: ../src/main_window.c:264
-msgid "Open a folder"
-msgstr ""
-
-#: ../src/main_window.c:265
-msgid "_Save copy"
-msgstr ""
-
-#: ../src/main_window.c:265
-msgid "Save a copy of the image"
-msgstr ""
-
-#: ../src/main_window.c:266
-msgid "_Print"
-msgstr ""
-
-#: ../src/main_window.c:266
-msgid "Print the image"
-msgstr ""
-
-#: ../src/main_window.c:267
-msgid "_Close"
-msgstr ""
-
-#: ../src/main_window.c:267
-msgid "Close this image"
-msgstr ""
-
-#: ../src/main_window.c:268
-msgid "_Close All"
-msgstr ""
-
-#: ../src/main_window.c:268
-msgid "Close all images"
-msgstr ""
-
-#: ../src/main_window.c:269
-msgid "_Quit"
-msgstr ""
-
-#: ../src/main_window.c:269
-msgid "Quit Ristretto"
-msgstr ""
-
-#. Edit Menu
-#: ../src/main_window.c:271
-msgid "_Edit"
-msgstr ""
-
-#: ../src/main_window.c:272
-msgid "_Open with..."
-msgstr ""
-
-#: ../src/main_window.c:273
-msgid "_Sorting"
-msgstr ""
-
-#: ../src/main_window.c:274
-msgid "_Delete"
-msgstr ""
-
-#: ../src/main_window.c:275
-msgid "_Preferences"
-msgstr ""
-
-#. View Menu
-#: ../src/main_window.c:277
-msgid "_View"
-msgstr ""
-
-#: ../src/main_window.c:278
-msgid "_Fullscreen"
-msgstr ""
-
-#: ../src/main_window.c:279
-msgid "_Leave Fullscreen"
-msgstr ""
-
-#: ../src/main_window.c:280
-msgid "_Set as Wallpaper"
-msgstr ""
-
-#. Zoom submenu
-#: ../src/main_window.c:282
-msgid "_Zooming"
-msgstr ""
-
-#: ../src/main_window.c:283
-msgid "Zoom _In"
-msgstr ""
-
-#: ../src/main_window.c:284
-msgid "Zoom _Out"
-msgstr ""
-
-#: ../src/main_window.c:285
-msgid "Zoom _Fit"
-msgstr ""
-
-#: ../src/main_window.c:286
-msgid "_Normal Size"
-msgstr ""
-
-#. Rotation submenu
-#: ../src/main_window.c:288
-msgid "_Rotation"
-msgstr ""
-
-#: ../src/main_window.c:289
-msgid "Rotate _Right"
-msgstr ""
-
-#: ../src/main_window.c:290
-msgid "Rotate _Left"
-msgstr ""
-
-#. Go Menu
-#: ../src/main_window.c:292
-msgid "_Go"
-msgstr ""
-
-#: ../src/main_window.c:293
-msgid "_Forward"
-msgstr ""
-
-#: ../src/main_window.c:294
-msgid "_Back"
-msgstr ""
-
-#: ../src/main_window.c:295
-msgid "_First"
-msgstr ""
-
-#: ../src/main_window.c:296
-msgid "_Last"
-msgstr ""
-
-#. Help Menu
-#: ../src/main_window.c:298
-msgid "_Help"
-msgstr ""
-
-#: ../src/main_window.c:300
-msgid "_Contents"
-msgstr ""
-
-#: ../src/main_window.c:302
-msgid "Display ristretto user manual"
-msgstr ""
-
-#: ../src/main_window.c:305
-msgid "_About"
-msgstr ""
-
-#: ../src/main_window.c:307
-msgid "Display information about ristretto"
-msgstr ""
-
-#. Position Menu
-#: ../src/main_window.c:310
-msgid "_Position"
-msgstr ""
-
-#. Misc
-#: ../src/main_window.c:312
-msgid "Leave _Fullscreen"
-msgstr ""
-
-#. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:320
-msgid "Show _File Toolbar"
-msgstr ""
-
-#. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:322
-msgid "Show _Navigation Toolbar"
-msgstr ""
-
-#. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:324
-msgid "Show _Thumbnailbar"
-msgstr ""
-
-#. Sort by Filename
-#: ../src/main_window.c:331
-msgid "sort by filename"
-msgstr ""
-
-#. Sort by Date
-#: ../src/main_window.c:333
-msgid "sort by date"
-msgstr ""
-
-#: ../src/main_window.c:339
-msgid "Left"
-msgstr ""
-
-#: ../src/main_window.c:340
-msgid "Right"
-msgstr ""
-
-#: ../src/main_window.c:341
-msgid "Top"
-msgstr ""
-
-#: ../src/main_window.c:342
-msgid "Bottom"
-msgstr ""
-
-#: ../src/main_window.c:512 ../src/main_window.c:778
-msgid "Press open to select an image"
-msgstr ""
-
-#: ../src/main_window.c:765 ../src/main_window.c:770
-msgid "Empty"
-msgstr ""
-
-#: ../src/main_window.c:1545
-msgid "Developer:"
-msgstr ""
-
-#: ../src/main_window.c:1555
-msgid "Ristretto is an imageviewer for the Xfce desktop environment."
-msgstr ""
-
-#: ../src/main_window.c:1563
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/main_window.c:1878
-msgid "Open image"
-msgstr ""
-
-#: ../src/main_window.c:1890
-msgid "Images"
-msgstr ""
-
-#: ../src/main_window.c:1895
-msgid ".jp(e)g"
-msgstr ""
-
-#: ../src/main_window.c:1917 ../src/main_window.c:1940
-#: ../src/main_window.c:2099 ../src/main_window.c:2114
-msgid "Could not open file"
-msgstr ""
-
-#: ../src/main_window.c:1992
-msgid "Open folder"
-msgstr ""
-
-#: ../src/main_window.c:2137
-msgid "Save copy"
-msgstr ""
-
-#: ../src/main_window.c:2210
-#, c-format
-msgid "Are you sure you want to delete image '%s' from disk?"
-msgstr ""
-
-#: ../src/preferences_dialog.c:230
-msgid "Display"
-msgstr ""
-
-#: ../src/preferences_dialog.c:235
-msgid "Background color"
-msgstr ""
-
-#: ../src/preferences_dialog.c:239
-msgid "Override background color:"
-msgstr ""
-
-#: ../src/preferences_dialog.c:267
-msgid "Quality"
-msgstr ""
-
-#: ../src/preferences_dialog.c:271
-msgid "Maximum render quality:"
-msgstr ""
-
-#: ../src/preferences_dialog.c:274
-msgid "Show preview when loading image"
-msgstr ""
-
-#: ../src/preferences_dialog.c:281
-msgid "Best"
-msgstr ""
-
-#: ../src/preferences_dialog.c:282
-msgid "High"
-msgstr ""
-
-#: ../src/preferences_dialog.c:283
-msgid "Medium"
-msgstr ""
-
-#: ../src/preferences_dialog.c:284
-msgid "Low"
-msgstr ""
-
-#: ../src/preferences_dialog.c:324
-msgid "Slideshow"
-msgstr ""
-
-#: ../src/preferences_dialog.c:328
-msgid "Timeout"
-msgstr ""
-
-#: ../src/preferences_dialog.c:331
-msgid ""
-"The time period an individual image is displayed during a slideshow\n"
-"(in seconds)"
-msgstr ""
-
-#: ../src/preferences_dialog.c:346
-msgid "Thumbnails"
-msgstr ""
-
-#: ../src/preferences_dialog.c:349
-msgid ""
-"The thumbnailbar can be automatically hidden \n"
-"when the image-viewer is fullscreen."
-msgstr ""
-
-#: ../src/preferences_dialog.c:351
-msgid "Hide thumbnailbar when fullscreen"
-msgstr ""
-
-#: ../src/preferences_dialog.c:364
-msgid "Control"
-msgstr ""
-
-#: ../src/preferences_dialog.c:368
-msgid "Scrollwheel"
-msgstr ""
-
-#: ../src/preferences_dialog.c:371
-msgid "No action"
-msgstr ""
-
-#: ../src/preferences_dialog.c:375
-msgid "Zoom in and out"
-msgstr ""
-
-#: ../src/preferences_dialog.c:378
-msgid "Switch images"
-msgstr ""
-
-#: ../src/preferences_dialog.c:412
-msgid "Behaviour"
-msgstr ""
-
-#: ../src/preferences_dialog.c:417
-msgid "Scaling"
-msgstr ""
-
-#: ../src/preferences_dialog.c:422
-msgid "Don't scale over 100% when maximizing the window."
-msgstr ""
-
-#: ../src/preferences_dialog.c:426
-msgid "Startup"
-msgstr ""
-
-#: ../src/preferences_dialog.c:428
-msgid "Resize window to image on startup"
-msgstr ""
-
-#: ../src/preferences_dialog.c:432
-msgid "Open entire folder on startup"
-msgstr ""
-
-#: ../src/preferences_dialog.c:437
-msgid "Wrap around images"
-msgstr ""
-
-#: ../src/preferences_dialog.c:453
-msgid "Memory"
-msgstr ""
-
-#: ../src/preferences_dialog.c:459
-msgid "Image cache"
-msgstr ""
-
-#: ../src/preferences_dialog.c:465
-msgid "Cache size"
-msgstr ""
-
-#: ../src/preferences_dialog.c:466
-msgid "MB"
-msgstr ""
-
-#: ../src/preferences_dialog.c:469
-msgid "Enable cache"
-msgstr ""
-
-#: ../src/preferences_dialog.c:474
-msgid "Preload images"
-msgstr ""
-
-#: ../src/preferences_dialog.c:544
-msgid "Preferences"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:84
-msgid "Set as wallpaper"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:86
-msgid "Style:"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:88
-msgid "Monitor:"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:90
-msgid "Brightness:"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:91
-msgid "Saturation:"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:123
-msgid "Auto"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:124
-msgid "Centered"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:125
-msgid "Tiled"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:126
-msgid "Stretched"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:127
-msgid "Scaled"
-msgstr ""
-
-#: ../src/xfce_wallpaper_manager.c:128
-msgid "Zoomed"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:187
-msgid "Spacing"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:188
-msgid "The amount of space between the thumbnails"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:194
-msgid "border width"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:195
-msgid "the border width of the thumbnail-bar"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:201
-msgid "filmstrip width"
-msgstr ""
-
-#: ../src/thumbnail_bar.c:202
-msgid "the width of the thumbnail-bar film-strip"
-msgstr ""
-
-#: ../ristretto.desktop.in.h:1
-msgid "Image Viewer"
-msgstr ""
-
-#: ../ristretto.desktop.in.h:2
-msgid "Look at your photo's easily"
-msgstr ""
-
-#: ../ristretto.desktop.in.h:3
-msgid "Ristretto Photo Viewer"
-msgstr ""
diff --git a/src/main_window.c b/src/main_window.c
index 0f2ec24..7807b11 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -254,6 +254,9 @@ rstto_main_window_update_buttons (RsttoMainWindow *window);
 static void
 rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint orientation);
 
+static void
+cb_rstto_main_window_vpaned_pos_changed (GtkWidget *widget, gpointer user_data);
+
 static GtkWidgetClass *parent_class = NULL;
 
 static GtkActionEntry action_entries[] =
@@ -505,6 +508,7 @@ rstto_main_window_init (RsttoMainWindow *window)
     gtk_paned_pack1 (GTK_PANED (window->priv->vpaned_bottom), window->priv->p_viewer_s_window, TRUE, FALSE);
     gtk_paned_pack2 (GTK_PANED (window->priv->hpaned_right), window->priv->thumbnailbar, FALSE, FALSE);
 
+
     window->priv->statusbar = gtk_statusbar_new();
     window->priv->statusbar_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR(window->priv->statusbar), "image-data");
     gtk_statusbar_push (GTK_STATUSBAR(window->priv->statusbar), 
@@ -629,6 +633,12 @@ rstto_main_window_init (RsttoMainWindow *window)
     g_signal_connect(G_OBJECT(window->priv->thumbnailbar), "button-press-event", G_CALLBACK(cb_rstto_main_window_navigationtoolbar_button_press_event), window);
 
     g_signal_connect(G_OBJECT(window->priv->settings_manager), "notify", G_CALLBACK(cb_rstto_main_window_settings_notify), window);
+
+    g_signal_connect(G_OBJECT(window->priv->vpaned_top), "accept-position", G_CALLBACK(cb_rstto_main_window_vpaned_pos_changed), window);
+    g_signal_connect(G_OBJECT(window->priv->vpaned_bottom), "accept-position", G_CALLBACK(cb_rstto_main_window_vpaned_pos_changed), window);
+
+    gtk_paned_set_position (GTK_PANED(window->priv->vpaned_top), rstto_settings_get_uint_property(window->priv->settings_manager, "thumbnailbar-size"));
+    gtk_paned_set_position (GTK_PANED(window->priv->vpaned_bottom), rstto_settings_get_uint_property(window->priv->settings_manager, "thumbnailbar-size"));
 }
 
 static void
@@ -659,7 +669,6 @@ static void
 rstto_main_window_dispose(GObject *object)
 {
     RsttoMainWindow *window = RSTTO_MAIN_WINDOW(object);
-    G_OBJECT_CLASS (parent_class)->dispose(object); 
 
     if (window->priv->ui_manager)
     {
@@ -669,9 +678,34 @@ rstto_main_window_dispose(GObject *object)
 
     if (window->priv->settings_manager)
     {
+        switch (rstto_settings_get_navbar_position (window->priv->settings_manager))
+        {
+            case 0:
+                rstto_settings_set_int_property (window->priv->settings_manager, 
+                                        "thumbnailbar-size",
+                                        gtk_paned_get_position (GTK_PANED(window->priv->hpaned_left)));
+                break;
+            case 1:
+                rstto_settings_set_int_property (window->priv->settings_manager, 
+                                        "thumbnailbar-size", 
+                                        gtk_paned_get_position (GTK_PANED(window->priv->hpaned_right)));
+                break;
+            case 2:
+                rstto_settings_set_int_property (window->priv->settings_manager, 
+                                        "thumbnailbar-size", 
+                                        gtk_paned_get_position (GTK_PANED(window->priv->vpaned_top)));
+                break;
+            case 3:
+                rstto_settings_set_int_property (window->priv->settings_manager, 
+                                        "thumbnailbar-size", 
+                                        gtk_paned_get_position (GTK_PANED(window->priv->vpaned_bottom)));
+                break;
+        }
         g_object_unref (window->priv->settings_manager);
         window->priv->settings_manager = NULL;
     }
+
+    G_OBJECT_CLASS (parent_class)->dispose(object); 
 }
 
 /**
@@ -2384,3 +2418,12 @@ cb_rstto_main_window_image_updated (RsttoImage *image, RsttoMainWindow *window)
         g_free (status);
     }
 }
+
+static void
+cb_rstto_main_window_vpaned_pos_changed (GtkWidget *widget, gpointer user_data)
+{
+    RsttoMainWindow *window = RSTTO_MAIN_WINDOW (user_data);
+
+    rstto_settings_set_uint_property (RSTTO_SETTINGS (window->priv->settings_manager), "thumbnailbar-size", gtk_paned_get_position (GTK_PANED(widget)));
+    g_debug("%s", __FUNCTION__);
+}
diff --git a/src/settings.c b/src/settings.c
index e07091b..3a3d359 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -75,6 +75,7 @@ enum
     PROP_SCROLLWHEEL_SECONDARY_ACTION,
     PROP_OPEN_ENTIRE_FOLDER,
     PROP_WRAP_IMAGES,
+    PROP_THUMBNAILBAR_SIZE,
 };
 
 GType
@@ -128,6 +129,7 @@ struct _RsttoSettingsPriv
     gchar    *scrollwheel_primary_action;
     gchar    *scrollwheel_secondary_action;
     gboolean  wrap_images;
+    gint     thumbnailbar_size;
 };
 
 
@@ -186,6 +188,7 @@ rstto_settings_init (GObject *object)
     xfconf_g_property_bind (settings->priv->channel, "/image/cache-size", G_TYPE_UINT, settings, "cache-size");
     xfconf_g_property_bind (settings->priv->channel, "/image/quality", G_TYPE_UINT, settings, "image-quality");
     xfconf_g_property_bind (settings->priv->channel, "/image/wrap", G_TYPE_BOOLEAN, settings, "wrap-images");
+    xfconf_g_property_bind (settings->priv->channel, "/window/thumbnailbar/size", G_TYPE_INT, settings, "thumbnailbar-size");
 }
 
 
@@ -404,6 +407,17 @@ rstto_settings_class_init (GObjectClass *object_class)
     g_object_class_install_property (object_class,
                                      PROP_WRAP_IMAGES,
                                      pspec);
+
+    pspec = g_param_spec_int    ("thumbnailbar-size",
+                                  "",
+                                  "",
+                                  -1,
+                                  4000,
+                                  70,
+                                  G_PARAM_READWRITE);
+    g_object_class_install_property (object_class,
+                                     PROP_THUMBNAILBAR_SIZE,
+                                     pspec);
 }
 
 /**
@@ -565,6 +579,9 @@ rstto_settings_set_property    (GObject      *object,
         case PROP_WRAP_IMAGES:
             settings->priv->wrap_images = g_value_get_boolean (value);
             break;
+        case PROP_THUMBNAILBAR_SIZE:
+            settings->priv->thumbnailbar_size = g_value_get_int (value);
+            break;
         default:
             break;
     }
@@ -643,6 +660,9 @@ rstto_settings_get_property    (GObject    *object,
         case PROP_WRAP_IMAGES:
             g_value_set_boolean (value, settings->priv->wrap_images);
             break;
+        case PROP_THUMBNAILBAR_SIZE:
+            g_value_set_int (value, settings->priv->thumbnailbar_size);
+            break;
         default:
             break;
 
@@ -726,6 +746,37 @@ rstto_settings_get_uint_property (RsttoSettings *settings,
 }
 
 void
+rstto_settings_set_int_property (RsttoSettings *settings,
+                                  const gchar *property_name,
+                                  gint value)
+{
+    GValue val = {0, };
+    g_value_init (&val, G_TYPE_INT);
+
+    g_value_set_int (&val, value);
+
+    g_object_set_property (G_OBJECT(settings), property_name, &val);
+
+    g_value_reset (&val);
+}
+
+gint
+rstto_settings_get_int_property (RsttoSettings *settings,
+                                  const gchar *property_name)
+{
+    gint value;
+    GValue val = {0, };
+    g_value_init (&val, G_TYPE_INT);
+
+    g_object_get_property (G_OBJECT(settings), property_name, &val);
+    value = g_value_get_int (&val);
+
+    g_value_reset (&val);
+
+    return value;
+}
+
+void
 rstto_settings_set_string_property (RsttoSettings *settings,
                                     const gchar *property_name,
                                     const gchar *value)
diff --git a/src/settings.h b/src/settings.h
index 1ee7fdd..06aea1e 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -67,6 +67,8 @@ guint  rstto_settings_get_navbar_position (RsttoSettings *);
 
 void        rstto_settings_set_uint_property (RsttoSettings *, const gchar *, guint);
 guint       rstto_settings_get_uint_property (RsttoSettings *, const gchar *);
+void        rstto_settings_set_int_property (RsttoSettings *, const gchar *, gint);
+gint       rstto_settings_get_int_property (RsttoSettings *, const gchar *);
 void        rstto_settings_set_string_property (RsttoSettings *, const gchar *, const gchar *);
 gchar      *rstto_settings_get_string_property (RsttoSettings *, const gchar *);
 void        rstto_settings_set_boolean_property (RsttoSettings *, const gchar *, gboolean);
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index 43f1dae..a9f3434 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -117,7 +117,7 @@ rstto_thumbnailer_init (GObject *object)
                                                                 "org.freedesktop.thumbnails.Thumbnailer1");
         dbus_g_proxy_add_signal (thumbnailer->priv->proxy, "Finished", G_TYPE_UINT, G_TYPE_INVALID);
 
-        dbus_g_proxy_connect_signal (thumbnailer->priv->proxy, "Finished", cb_rstto_thumbnailer_request_finished, thumbnailer, NULL);
+        dbus_g_proxy_connect_signal (thumbnailer->priv->proxy, "Finished", G_CALLBACK(cb_rstto_thumbnailer_request_finished), thumbnailer, NULL);
     }
 }
 
@@ -247,7 +247,7 @@ static gboolean
 rstto_thumbnailer_queue_request_timer (RsttoThumbnailer *thumbnailer)
 {
     gchar **uris;
-    gchar **mimetypes;
+    const gchar **mimetypes;
     GSList *iter;
     gint i = 0;
     GFile *file;
@@ -256,7 +256,7 @@ rstto_thumbnailer_queue_request_timer (RsttoThumbnailer *thumbnailer)
     GFileInfo *file_info;
 
     uris = g_new0 (gchar *, g_slist_length(thumbnailer->priv->queue)+1);
-    mimetypes = g_new0 (gchar *, g_slist_length(thumbnailer->priv->queue)+1);
+    mimetypes = g_new0 (const gchar *, g_slist_length(thumbnailer->priv->queue)+1);
 
     iter = thumbnailer->priv->queue;
     while (iter)


More information about the Xfce4-commits mailing list