[Xfce4-commits] <ristretto:master> Fix compile errors

[Stephan Arts]

Updating branch refs/heads/master
         to 4f62ab593526b892fbc82f8215834de3eb839660 (commit)
       from cf5824dbf292a0f3fcb2ac0835d281f0f465b202 (commit)

commit 4f62ab593526b892fbc82f8215834de3eb839660
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Apr 16 17:58:20 2012 +0200

    Fix compile errors

 src/file.c        |    2 +-
 src/main_window.c |   14 +++++++-------
 src/thumbnailer.c |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/file.c b/src/file.c
index d5beabf..8239212 100644
--- a/src/file.c
+++ b/src/file.c
@@ -30,7 +30,7 @@
 #include "file.h"
 #include "thumbnailer.h"
 
-static uint rstto_thumbnail_size[] =
+static guint rstto_thumbnail_size[] =
 {
     THUMBNAIL_SIZE_VERY_SMALL_SIZE,
     THUMBNAIL_SIZE_SMALLER_SIZE,
diff --git a/src/main_window.c b/src/main_window.c
index 6717775..0af8470 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1848,23 +1848,23 @@ cb_rstto_main_window_set_as_wallpaper (GtkWidget *widget, RsttoMainWindow *windo
                 0);
 
         choose_desktop_combo_box =
-                gtk_combo_box_text_new();
+                gtk_combo_box_new_text();
         gtk_box_pack_start (
                 GTK_BOX (content_area),
                 choose_desktop_combo_box,
                 FALSE,
                 FALSE,
                 0);
-        gtk_combo_box_text_insert_text(
-                GTK_COMBO_BOX_TEXT (choose_desktop_combo_box),
+        gtk_combo_box_insert_text(
+                GTK_COMBO_BOX (choose_desktop_combo_box),
                 DESKTOP_TYPE_NONE,
                 _("None"));
-        gtk_combo_box_text_insert_text (
-                GTK_COMBO_BOX_TEXT (choose_desktop_combo_box),
+        gtk_combo_box_insert_text (
+                GTK_COMBO_BOX (choose_desktop_combo_box),
                 DESKTOP_TYPE_XFCE,
                 _("Xfce"));
-        gtk_combo_box_text_insert_text (
-                GTK_COMBO_BOX_TEXT (choose_desktop_combo_box),
+        gtk_combo_box_insert_text (
+                GTK_COMBO_BOX (choose_desktop_combo_box),
                 DESKTOP_TYPE_GNOME,
                 _("GNOME"));
 
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index 06d4312..584ac80 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -462,8 +462,8 @@ rstto_thumbnailer_queue_request_timer (
                         "Install <b>Tumbler</b> or another <i>thumbnailing daemon</i>\n"
                         "to resolve this issue.")
                         );
-                vbox = gtk_message_dialog_get_message_area (
-                        GTK_MESSAGE_DIALOG (error_dialog));
+                vbox = gtk_dialog_get_content_area (
+                        GTK_DIALOG (error_dialog));
 
                 do_not_show_checkbox = gtk_check_button_new_with_mnemonic (
                         _("Do _not show this message again"));