From f40483a67f4048190c50d6750a2c25ef1c2fc3fd Mon Sep 17 00:00:00 2001 From: Romain Bouvier Date: Sat, 4 Sep 2010 12:39:44 +0200 Subject: [PATCH] Port xfce4-screenshooter to libxfce4ui --- Makefile.am | 12 ++++++------ configure.ac.in | 2 +- lib/screenshooter-dialogs.h | 3 +-- lib/screenshooter-utils.h | 1 - panel-plugin/screenshooter-plugin.c | 8 ++++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6f96220..d98c111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,14 +39,14 @@ lib_libscreenshooter_la_CFLAGS = \ @GTK_CFLAGS@ \ @GLIB_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @SOUP_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" lib_libscreenshooter_la_LIBADD = \ @GTK_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @GLIB_LIBS@ \ @SOUP_LIBS@ @@ -78,7 +78,7 @@ src_xfce4_screenshooter_CFLAGS = \ @GTK_CFLAGS@ \ @GLIB_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @GTHREAD_CFLAGS@ \ @SOUP_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" @@ -89,7 +89,7 @@ src_xfce4_screenshooter_LDFLAGS = \ @GTHREAD_LIBS@ \ @SOUP_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ + @LIBXFCE4UI_LIBS@ src_xfce4_screenshooter_LDADD = lib/libscreenshooter.la @@ -117,7 +117,7 @@ panel_plugin_xfce4_screenshooter_plugin_CFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib/ \ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @GTHREAD_CFLAGS@ \ @SOUP_CFLAGS@ @@ -125,7 +125,7 @@ panel_plugin_xfce4_screenshooter_plugin_LDFLAGS = \ @LIBXFCE4PANEL_LIBS@ \ @GTHREAD_LIBS@ \ @SOUP_LIBS@ \ - @LIBXFCEGUI4_LIBS@ + @LIBXFCE4UI_LIBS@ panel_plugin_xfce4_screenshooter_plugin_LDADD = lib/libscreenshooter.la diff --git a/configure.ac.in b/configure.ac.in index 9d39874..482ad3f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -48,7 +48,7 @@ dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0]) diff --git a/lib/screenshooter-dialogs.h b/lib/screenshooter-dialogs.h index b97b5fa..0e79048 100644 --- a/lib/screenshooter-dialogs.h +++ b/lib/screenshooter-dialogs.h @@ -33,8 +33,7 @@ #include #include -#include - +#include GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd); GtkWidget *screenshooter_region_dialog_new (ScreenshotData *sd, diff --git a/lib/screenshooter-utils.h b/lib/screenshooter-utils.h index f40929a..e6167a6 100644 --- a/lib/screenshooter-utils.h +++ b/lib/screenshooter-utils.h @@ -32,7 +32,6 @@ #include #include -#include diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c index b0ac320..e8bc9a4 100644 --- a/panel-plugin/screenshooter-plugin.c +++ b/panel-plugin/screenshooter-plugin.c @@ -28,7 +28,7 @@ t */ #include #include -#include +#include #include #include @@ -119,7 +119,11 @@ cb_set_size (XfcePanelPlugin *plugin, int size, PluginData *pd) pd->button->style->ythickness); TRACE ("Get the icon from the theme"); - pb = xfce_themed_icon_load (SCREENSHOT_ICON_NAME, width); + pb = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), + SCREENSHOT_ICON_NAME, + width, + GTK_ICON_LOOKUP_FORCE_SIZE, + NULL); TRACE ("Set the new icon"); gtk_image_set_from_pixbuf (GTK_IMAGE (pd->image), pb); -- 1.7.2.2