[Xfce4-commits] <thunar:master> Depend on Gtk 2.20 and Glib 2.24.
Nick Schermer
noreply at xfce.org
Sat Jan 21 15:20:01 CET 2012
Updating branch refs/heads/master
to 9f249baaf40f96f402da87afdbd1ed56eb7b4c9e (commit)
from d49135ddd7aae736c1eeef101bcc3580f4756537 (commit)
commit 9f249baaf40f96f402da87afdbd1ed56eb7b4c9e
Author: Nick Schermer <nick at xfce.org>
Date: Sat Jan 21 14:58:06 2012 +0100
Depend on Gtk 2.20 and Glib 2.24.
configure.in.in | 10 +++++-----
plugins/thunar-apr/thunar-apr-desktop-page.c | 2 +-
plugins/thunar-uca/thunar-uca-provider.c | 4 ----
thunar/thunar-dialogs.c | 5 -----
thunar/thunar-gio-extensions.c | 8 --------
thunar/thunar-progress-dialog.c | 4 ----
thunarx/thunarx-private.h | 4 ----
7 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 427d828..1eecf31 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -153,10 +153,10 @@ dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
@@ -170,7 +170,7 @@ dnl **********************************
dnl *** Optional GIO UNIX features ***
dnl **********************************
XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0],
- [2.18.0], [gio-unix], [GIO UNIX features])
+ [2.24.0], [gio-unix], [GIO UNIX features])
dnl **********************************
dnl *** Optional support for D-BUS ***
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c b/plugins/thunar-apr/thunar-apr-desktop-page.c
index fed01fc..4d5498a 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -41,7 +41,7 @@
#include <thunar-apr/thunar-apr-desktop-page.h>
/* use g_access() on win32 */
-#if GLIB_CHECK_VERSION(2,8,0) && defined(G_OS_WIN32)
+#if defined(G_OS_WIN32)
#include <glib/gstdio.h>
#else
#define g_access(filename, mode) (access ((filename), (mode)))
diff --git a/plugins/thunar-uca/thunar-uca-provider.c b/plugins/thunar-uca/thunar-uca-provider.c
index 21e3c24..3ac481d 100644
--- a/plugins/thunar-uca/thunar-uca-provider.c
+++ b/plugins/thunar-uca/thunar-uca-provider.c
@@ -220,11 +220,7 @@ thunar_uca_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
/* create the new action with the given parameters */
action = gtk_action_new (name, label, tooltip, NULL);
-#if GTK_CHECK_VERSION (2, 16, 0)
gtk_action_set_icon_name (action, icon_name);
-#else
- g_object_set (G_OBJECT (action), "icon-name", icon_name, NULL);
-#endif
/* grab a tree row reference on the given path */
row = gtk_tree_row_reference_new (GTK_TREE_MODEL (uca_provider->model), lp->data);
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 3d92ec4..b79391c 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -228,11 +228,6 @@ thunar_dialogs_show_about (GtkWindow *parent,
/* try to load the about logo */
logo = gdk_pixbuf_new_from_file (DATADIR "/pixmaps/Thunar/Thunar-about-logo.png", NULL);
-#if !GTK_CHECK_VERSION (2, 18, 0)
- gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
- gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-#endif
-
/* open the about dialog */
gtk_show_about_dialog (parent,
"artists", artists,
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index 6712ab0..6200688 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -205,11 +205,7 @@ thunar_g_file_write_key_file (GFile *file,
/* try to replace the file contents with the key file data */
if (!g_file_replace_contents (file, contents, length, NULL, FALSE,
-#if GLIB_CHECK_VERSION(2,20,0)
G_FILE_CREATE_REPLACE_DESTINATION,
-#else
- G_FILE_CREATE_NONE,
-#endif
NULL, cancellable, error))
{
g_free (contents);
@@ -544,9 +540,7 @@ thunar_g_volume_is_present (GVolume *volume)
gboolean has_media = FALSE;
gboolean is_shadowed = FALSE;
GDrive *drive;
-#if GLIB_CHECK_VERSION (2, 20, 0)
GMount *mount;
-#endif
_thunar_return_val_if_fail (G_IS_VOLUME (volume), FALSE);
@@ -557,14 +551,12 @@ thunar_g_volume_is_present (GVolume *volume)
g_object_unref (drive);
}
-#if GLIB_CHECK_VERSION (2, 20, 0)
mount = g_volume_get_mount (volume);
if (mount != NULL)
{
is_shadowed = g_mount_is_shadowed (mount);
g_object_unref (mount);
}
-#endif
return has_media && !is_shadowed;
}
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index ca9409c..dd70231 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -302,11 +302,7 @@ thunar_progress_dialog_update_status_icon (ThunarProgressDialog *dialog)
n_views);
/* update the tooltip */
-#if GTK_CHECK_VERSION (2, 16, 0)
gtk_status_icon_set_tooltip_text (dialog->status_icon, tooltip_text);
-#else
- gtk_status_icon_set_tooltip (dialog->status_icon, tooltip_text);
-#endif
/* free the string */
g_free (tooltip_text);
diff --git a/thunarx/thunarx-private.h b/thunarx/thunarx-private.h
index 1b6240e..1503bfb 100644
--- a/thunarx/thunarx-private.h
+++ b/thunarx/thunarx-private.h
@@ -29,11 +29,7 @@
G_BEGIN_DECLS;
-#if GLIB_CHECK_VERSION(2,9,0)
#define I_(string) (g_intern_static_string ((string)))
-#else
-#define I_(string) (g_quark_to_string (g_quark_from_static_string ((string))))
-#endif
G_GNUC_INTERNAL
void thunarx_object_list_take_reference (GList *object_list,
More information about the Xfce4-commits
mailing list