From 2b7de381b1309451836f5053523d48b77f38f7a2 Mon Sep 17 00:00:00 2001 From: Romain Bouvier Date: Thu, 15 Apr 2010 23:15:06 +0200 Subject: [PATCH] Port ristretto to libxfce4ui --- configure.in.in | 4 ++-- src/Makefile.am | 4 ++-- src/main_window.c | 2 +- src/preferences_dialog.c | 18 +++++++++--------- src/thumbnail_bar.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.in.in b/configure.in.in index c71f168..4ad0729 100644 --- a/configure.in.in +++ b/configure.in.in @@ -52,14 +52,14 @@ dnl Check for i18n support XDT_I18N([@LINGUAS@]) XDT_CHECK_PACKAGE([LIBEXIF], [libexif], [0.6.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0]) XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.16.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0]) XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) diff --git a/src/Makefile.am b/src/Makefile.am index e5e8a5f..edc0a76 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ ristretto_CFLAGS = \ $(XFCONF_CFLAGS) \ $(CAIRO_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ -DLOCALEDIR=\"$(localedir)\" @@ -40,7 +40,7 @@ ristretto_LDADD = \ $(CAIRO_LIBS) \ $(XFCONF_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCEGUI4_LIBS) + $(LIBXFCE4UI_LIBS) INCLUDES = \ -I${top_srcdir} diff --git a/src/main_window.c b/src/main_window.c index 0f2ec24..e6315c4 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c index 222399e..58f955c 100644 --- a/src/preferences_dialog.c +++ b/src/preferences_dialog.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "settings.h" @@ -232,7 +232,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) /** Bg-color frame */ dialog->priv->display_tab.bgcolor_vbox = gtk_vbox_new (FALSE, 0); - dialog->priv->display_tab.bgcolor_frame = xfce_create_framebox_with_content (_("Background color"), + dialog->priv->display_tab.bgcolor_frame = xfce_gtk_frame_box_new_with_content (_("Background color"), dialog->priv->display_tab.bgcolor_vbox); gtk_box_pack_start (GTK_BOX (display_main_vbox), dialog->priv->display_tab.bgcolor_frame, FALSE, FALSE, 0); @@ -264,7 +264,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) /** Image-quality frame */ dialog->priv->display_tab.image_quality_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->display_tab.image_quality_frame = xfce_create_framebox_with_content (_("Quality"), + dialog->priv->display_tab.image_quality_frame = xfce_gtk_frame_box_new_with_content (_("Quality"), dialog->priv->display_tab.image_quality_vbox); gtk_box_pack_start (GTK_BOX (display_main_vbox), dialog->priv->display_tab.image_quality_frame, FALSE, FALSE, 0); @@ -325,7 +325,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), slideshow_main_vbox, slideshow_main_lbl); dialog->priv->slideshow_tab.timeout_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->slideshow_tab.timeout_frame = xfce_create_framebox_with_content (_("Timeout"), dialog->priv->slideshow_tab.timeout_vbox); + dialog->priv->slideshow_tab.timeout_frame = xfce_gtk_frame_box_new_with_content (_("Timeout"), dialog->priv->slideshow_tab.timeout_vbox); gtk_box_pack_start (GTK_BOX (slideshow_main_vbox), dialog->priv->slideshow_tab.timeout_frame, FALSE, FALSE, 0); timeout_lbl = gtk_label_new(_("The time period an individual image is displayed during a slideshow\n(in seconds)")); @@ -343,7 +343,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) dialog->priv->slideshow_tab.thumbnail_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->slideshow_tab.thumbnail_frame = xfce_create_framebox_with_content (_("Thumbnails"), dialog->priv->slideshow_tab.thumbnail_vbox); + dialog->priv->slideshow_tab.thumbnail_frame = xfce_gtk_frame_box_new_with_content (_("Thumbnails"), dialog->priv->slideshow_tab.thumbnail_vbox); gtk_box_pack_start (GTK_BOX (slideshow_main_vbox), dialog->priv->slideshow_tab.thumbnail_frame, FALSE, FALSE, 0); dialog->priv->slideshow_tab.hide_thumbnails_fullscreen_lbl = gtk_label_new(_("The thumbnailbar can be automatically hidden \nwhen the image-viewer is fullscreen.")); @@ -365,7 +365,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), control_main_vbox, control_main_lbl); dialog->priv->control_tab.scroll_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->control_tab.scroll_frame = xfce_create_framebox_with_content (_("Scrollwheel"), dialog->priv->control_tab.scroll_vbox); + dialog->priv->control_tab.scroll_frame = xfce_gtk_frame_box_new_with_content (_("Scrollwheel"), dialog->priv->control_tab.scroll_vbox); gtk_box_pack_start (GTK_BOX (control_main_vbox), dialog->priv->control_tab.scroll_frame, FALSE, FALSE, 0); dialog->priv->control_tab.no_scrollwheel_action_radio_button = gtk_radio_button_new_with_label (NULL, _("No action")); @@ -414,7 +414,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) /********************************************/ dialog->priv->behaviour_tab.scaling_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->behaviour_tab.scaling_frame = xfce_create_framebox_with_content (_("Scaling"), dialog->priv->behaviour_tab.scaling_vbox); + dialog->priv->behaviour_tab.scaling_frame = xfce_gtk_frame_box_new_with_content (_("Scaling"), dialog->priv->behaviour_tab.scaling_vbox); gtk_box_pack_start (GTK_BOX (behaviour_main_vbox), dialog->priv->behaviour_tab.scaling_frame, FALSE, FALSE, 0); /* not used */ gtk_widget_set_sensitive (dialog->priv->behaviour_tab.scaling_vbox, FALSE); @@ -423,7 +423,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) gtk_container_add (GTK_CONTAINER (dialog->priv->behaviour_tab.scaling_vbox), dialog->priv->behaviour_tab.resize_image_on_maximize); dialog->priv->behaviour_tab.startup_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->behaviour_tab.startup_frame = xfce_create_framebox_with_content (_("Startup"), dialog->priv->behaviour_tab.startup_vbox); + dialog->priv->behaviour_tab.startup_frame = xfce_gtk_frame_box_new_with_content (_("Startup"), dialog->priv->behaviour_tab.startup_vbox); gtk_box_pack_start (GTK_BOX (behaviour_main_vbox), dialog->priv->behaviour_tab.startup_frame, FALSE, FALSE, 0); dialog->priv->behaviour_tab.resize_window_on_startup_check_button = gtk_check_button_new_with_label (_("Resize window to image on startup")); gtk_container_add (GTK_CONTAINER (dialog->priv->behaviour_tab.startup_vbox), dialog->priv->behaviour_tab.resize_window_on_startup_check_button); @@ -456,7 +456,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog) /** Image-cache frame */ dialog->priv->cache_tab.cache_vbox = gtk_vbox_new(FALSE, 0); - dialog->priv->cache_tab.cache_frame = xfce_create_framebox_with_content (_("Image cache"), + dialog->priv->cache_tab.cache_frame = xfce_gtk_frame_box_new_with_content (_("Image cache"), dialog->priv->cache_tab.cache_vbox); gtk_box_pack_start (GTK_BOX (cache_main_vbox), dialog->priv->cache_tab.cache_frame, FALSE, FALSE, 0); diff --git a/src/thumbnail_bar.c b/src/thumbnail_bar.c index a955a93..c55f2fc 100644 --- a/src/thumbnail_bar.c +++ b/src/thumbnail_bar.c @@ -21,7 +21,7 @@ #include -#include +#include #include #include "image.h" -- 1.7.0.5