This is an automated email from the git hooks/post-receive script. b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository panel-plugins/xfce4-places-plugin.
commit 3e27f12f23debacee564034f2571a2e1747e4142 Author: Andre Miranda <[email protected]> Date: Sat Apr 20 14:56:19 2019 -0300 Bump glib version --- configure.in.in | 12 ++++++------ panel-plugin/model_system.c | 3 --- panel-plugin/view.c | 6 ------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/configure.in.in b/configure.in.in index e14eb2e..a0fdb28 100644 --- a/configure.in.in +++ b/configure.in.in @@ -25,11 +25,11 @@ LT_PREREQ([2.2.6]) LT_INIT([disable-static]) dnl check for required packages -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.22.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.22.0]) -XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.22.0]) -XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.22.0]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) +XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) +XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.42.0]) +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.42.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) @@ -38,7 +38,7 @@ XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) XDT_CHECK_LIBX11() -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.22.0], [gio-unix], +XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [gio-unix, for special treatment of mount points on UNIX]) dnl *** Optional support for libnotify *** diff --git a/panel-plugin/model_system.c b/panel-plugin/model_system.c index aa11aa5..20b2564 100644 --- a/panel-plugin/model_system.c +++ b/panel-plugin/model_system.c @@ -36,7 +36,6 @@ #include <libxfce4util/libxfce4util.h> #define TRASH 1 -#define XDG_USER_DIRS GLIB_CHECK_VERSION(2,14,0) #define pbg_priv(pbg) ((PBSysData*) pbg->priv) @@ -97,7 +96,6 @@ pbsys_desktop_dir(void) const gchar *home_dir = xfce_get_homedir(); gchar *desktop_dir = NULL; -#if XDG_USER_DIRS /* get the xdg desktop directory, or possibly NULL */ desktop_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP)); @@ -106,7 +104,6 @@ pbsys_desktop_dir(void) g_free(desktop_dir); return NULL; } -#endif /* fall back to ~/Desktop */ if(desktop_dir == NULL) diff --git a/panel-plugin/view.c b/panel-plugin/view.c index 4010998..8bbfb06 100644 --- a/panel-plugin/view.c +++ b/panel-plugin/view.c @@ -747,15 +747,9 @@ pview_open_menu_at (PlacesView *pd, /* menu timeout to poll for model changes */ if(pd->menu_timeout_id == 0){ -#if GLIB_CHECK_VERSION(2,14,0) pd->menu_timeout_id = g_timeout_add_seconds_full(G_PRIORITY_LOW, 2, (GSourceFunc) pview_cb_menu_timeout, pd, NULL); -#else - pd->menu_timeout_id = g_timeout_add_full(G_PRIORITY_LOW, 2000, - (GSourceFunc) pview_cb_menu_timeout, pd, - NULL); -#endif PLACES_DEBUG_MENU_TIMEOUT_COUNT(1); }else{ PLACES_DEBUG_MENU_TIMEOUT_COUNT(0); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
