diff --git a/acinclude.m4 b/acinclude.m4 index 1ea04d7b368a8954782f1d725dbc90dede886d7f..6695a5febfd400d996cffa05e5e158a698fe3c7a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -55,7 +55,7 @@ AC_DEFUN([BM_THUNAR_PLUGIN_TPA], AC_ARG_ENABLE([tpa-plugin], AC_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README]), [ac_bm_thunar_plugin_tpa=$enableval], [ac_bm_thunar_plugin_tpa=yes]) if test x"$ac_bm_thunar_plugin_tpa" = x"yes"; then - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0], + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.9.0], [ dnl # Can only build thunar-tpa if D-BUS was found previously ac_bm_thunar_plugin_tpa=$DBUS_FOUND diff --git a/plugins/thunar-tpa/thunar-tpa.c b/plugins/thunar-tpa/thunar-tpa.c index 63c60d90dcdf95a6eb7d140b1b4d1910913e7d8d..fe6a2abec13b26a4ca325614c359c669cd1ce85d 100644 --- a/plugins/thunar-tpa/thunar-tpa.c +++ b/plugins/thunar-tpa/thunar-tpa.c @@ -35,12 +35,6 @@ #include <thunar-tpa/thunar-tpa-bindings.h> -#ifdef LIBXFCE4PANEL_CHECK_VERSION -#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0) -#define HAS_PANEL_49 -#endif -#endif - typedef struct _ThunarTpaClass ThunarTpaClass; typedef struct _ThunarTpa ThunarTpa; @@ -59,12 +53,8 @@ GType thunar_tpa_get_type (void); void thunar_tpa_register_type (XfcePanelTypeModule *type_module); static void thunar_tpa_finalize (GObject *object); static void thunar_tpa_construct (XfcePanelPlugin *panel_plugin); - -#ifdef HAS_PANEL_49 static gboolean thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin, gint size); -#endif - static void thunar_tpa_error (ThunarTpa *plugin, GError *error); static void thunar_tpa_state (ThunarTpa *plugin, @@ -157,10 +147,7 @@ thunar_tpa_class_init (ThunarTpaClass *klass) plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass); plugin_class->construct = thunar_tpa_construct; - -#ifdef HAS_PANEL_49 plugin_class->size_changed = thunar_tpa_size_changed; -#endif } @@ -246,10 +233,8 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin) { ThunarTpa *plugin = THUNAR_TPA (panel_plugin); -#ifdef HAS_PANEL_49 /* make the plugin fit a single row */ xfce_panel_plugin_set_small (panel_plugin, TRUE); -#endif /* add the "Empty Trash" menu item */ xfce_panel_plugin_menu_insert_item (panel_plugin, GTK_MENU_ITEM (plugin->mi)); @@ -260,7 +245,6 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin) -#ifdef HAS_PANEL_49 static gboolean thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin, gint size) @@ -273,7 +257,6 @@ thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin, return TRUE; } -#endif