commit 6fdf7588bdf91184529f71df79f71859377326cb
Author: Jonathan Matthew <jonathan d14n org>
Date: Wed Feb 10 22:57:32 2010 +1000
require gtk+ 2.16 and glib 2.18
configure.ac | 4 ++--
lib/rb-file-helpers.c | 33 ---------------------------------
plugins/audiocd/rb-audiocd-source.c | 8 --------
widgets/rb-search-entry.c | 13 -------------
4 files changed, 2 insertions(+), 56 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f834ab9..7a92637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ AC_CHECK_SIZEOF(long)
DBUS_MIN_REQS=0.35
GST_0_10_REQS=0.10.20
-GTK_REQS=2.14.0
-GLIB_REQS=2.16.0
+GTK_REQS=2.16.0
+GLIB_REQS=2.18.0
GNOME_MEDIA_PROFILES_REQS=2.8
LIBNOTIFY_REQS=0.4.1
LIBGPOD_REQS=0.6
diff --git a/lib/rb-file-helpers.c b/lib/rb-file-helpers.c
index 5d76107..8b7acc9 100644
--- a/lib/rb-file-helpers.c
+++ b/lib/rb-file-helpers.c
@@ -1065,38 +1065,12 @@ check_file_is_directory (GFile *file, GError **error)
}
-#if !GLIB_CHECK_VERSION(2,17,1)
-static gboolean
-create_parent_dirs (GFile *file, GError **error)
-{
- gboolean ret;
- GFile *parent;
-
- ret = check_file_is_directory (file, error);
- if (ret == TRUE || *error != NULL) {
- return ret;
- }
-
- parent = g_file_get_parent (file);
- ret = create_parent_dirs (parent, error);
- g_object_unref (parent);
- if (ret == FALSE) {
- return FALSE;
- }
-
- return g_file_make_directory (file, NULL, error);
-}
-#endif
-
gboolean
rb_uri_create_parent_dirs (const char *uri, GError **error)
{
GFile *file;
GFile *parent;
gboolean ret;
-#if !GLIB_CHECK_VERSION(2,17,1)
- GError *l_error = NULL;
-#endif
/* ignore internal URI schemes */
if (g_str_has_prefix (uri, "xrb")) {
@@ -1111,18 +1085,11 @@ rb_uri_create_parent_dirs (const char *uri, GError **error)
return TRUE;
}
-#if GLIB_CHECK_VERSION(2,17,1)
ret = check_file_is_directory (parent, error);
if (ret == FALSE && *error == NULL) {
ret = g_file_make_directory_with_parents (parent, NULL, error);
}
-#else
- ret = create_parent_dirs (parent, &l_error);
- if (l_error != NULL) {
- g_propagate_error (error, l_error);
- }
-#endif
g_object_unref (parent);
return ret;
}
diff --git a/plugins/audiocd/rb-audiocd-source.c b/plugins/audiocd/rb-audiocd-source.c
index 3de7f67..d6fc8c4 100644
--- a/plugins/audiocd/rb-audiocd-source.c
+++ b/plugins/audiocd/rb-audiocd-source.c
@@ -1001,7 +1001,6 @@ gboolean
rb_audiocd_is_mount_audiocd (GMount *mount)
{
gboolean result = FALSE;
-#if GLIB_CHECK_VERSION(2,17,7)
char **types;
guint i;
GError *error = NULL;
@@ -1019,13 +1018,6 @@ rb_audiocd_is_mount_audiocd (GMount *mount)
}
g_strfreev (types);
}
-#else
- GFile *file;
-
- file = g_mount_get_root (mount);
- result = g_file_has_uri_scheme (file, "cdda");
- g_object_unref (file);
-#endif /* glib 2.17.7 */
return result;
}
diff --git a/widgets/rb-search-entry.c b/widgets/rb-search-entry.c
index c0f14fd..527abc0 100644
--- a/widgets/rb-search-entry.c
+++ b/widgets/rb-search-entry.c
@@ -34,10 +34,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2,16,0)
-#include "libsexy/sexy-icon-entry.h"
-#endif
-
#include "rb-search-entry.h"
static void rb_search_entry_class_init (RBSearchEntryClass *klass);
@@ -51,12 +47,10 @@ static void rb_search_entry_activate_cb (GtkEntry *gtkentry,
static gboolean rb_search_entry_focus_out_event_cb (GtkWidget *widget,
GdkEventFocus *event,
RBSearchEntry *entry);
-#if GTK_CHECK_VERSION(2,16,0)
static void rb_search_entry_clear_cb (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
GdkEvent *event,
RBSearchEntry *search_entry);
-#endif
struct RBSearchEntryPrivate
{
@@ -164,7 +158,6 @@ rb_search_entry_init (RBSearchEntry *entry)
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_box_pack_start (GTK_BOX (entry), label, FALSE, TRUE, 0);
-#if GTK_CHECK_VERSION(2,16,0)
entry->priv->entry = gtk_entry_new ();
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry->priv->entry),
GTK_ENTRY_ICON_SECONDARY,
@@ -176,10 +169,6 @@ rb_search_entry_init (RBSearchEntry *entry)
"icon-press",
G_CALLBACK (rb_search_entry_clear_cb),
entry, 0);
-#else
- entry->priv->entry = sexy_icon_entry_new ();
- sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (entry->priv->entry));
-#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
entry->priv->entry);
@@ -379,7 +368,6 @@ rb_search_entry_grab_focus (RBSearchEntry *entry)
gtk_widget_grab_focus (GTK_WIDGET (entry->priv->entry));
}
-#if GTK_CHECK_VERSION(2,16,0)
static void
rb_search_entry_clear_cb (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
@@ -388,4 +376,3 @@ rb_search_entry_clear_cb (GtkEntry *entry,
{
rb_search_entry_set_text (search_entry, "");
}
-#endif