commit e8efaa53ffde2b1088b90f8d13197bf96a091c04
Author: Maia Kozheva <si...@ubuntu.com>
Date: Sat Aug 28 02:16:03 2010 +0700
Make GIO a mandatory dependency (which it de facto is, as it's part of
glib), for impending POSIX -> GIO transition
configure.in | 21 +--------------------
libgtkpod/autodetection.c | 15 +--------------
libgtkpod/gp_itdb.c | 15 ---------------
3 files changed, 2 insertions(+), 49 deletions(-)
---
diff --git a/configure.in b/configure.in
index db159aa..06ae14d 100644
--- a/configure.in
+++ b/configure.in
@@ -79,6 +79,7 @@ PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0,,
[AC_MSG_FAILURE([*** $LIBGLA
PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.7.0,, [AC_MSG_FAILURE([***
$LIBGPOD_PKG_ERRORS])])
PKG_CHECK_MODULES(LIBANJUTA, libanjuta-1.0 >= 2.30.0,, [AC_MSG_FAILURE([***
$LIBANJUTA_PKG_ERRORS])])
PKG_CHECK_MODULES(LIBGDL, gdl-1.0 >= 2.26.0,, [AC_MSG_FAILURE([***
$LIBGDL_PKG_ERRORS])])
+PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.0,, [AC_MSG_FAILURE([***
$GIO_PKG_ERRORS])])
CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS
$LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS $LIBGDL_CFLAGS"
LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS
$LIBGPOD_LIBS $LIBANJUTA_LIBS $LIBGDL_LIBS"
@@ -151,25 +152,6 @@ else
have_curl="*no -- will build without coverart download support"
fi
-dnl Check for gio
-AC_ARG_WITH(gio, AC_HELP_STRING([--without-gio],[Disable autodetection
support]))
-if test "x$with_gio" != "xno"; then
- PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.15.0], have_gio=yes, have_gio=no)
- if test "x$with_gio" = "xyes" -a "x$have_gio" = "xno"; then
- AC_MSG_ERROR([gio support explicitly requested but gio could not be
found])
- fi
-fi
-AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
-if test "x$have_gio" = "xyes"; then
- have_gio="yes -- will build with automount support"
- AC_DEFINE(HAVE_GIO, 1, [Define if you have gio support])
- CPPFLAGS="$CPPFLAGS $GIO_CFLAGS"
- CFLAGS="$CFLAGS $GIO_CFLAGS"
- LIBS="$LIBS $GIO_LIBS"
-else
- have_gio="*no -- will build without iPod autodetection support"
-fi
-
dnl Check for webkit
dnl -------------------------------------------------------------
@@ -455,7 +437,6 @@ Core Configuration for $PACKAGE $VERSION :
Install path .........: $prefix
GTK2 version .........: `$PKG_CONFIG gtk+-2.0 --modversion`
GLib2/GThread version : `$PKG_CONFIG gthread-2.0 --modversion`
- gio ..................: $have_gio
libgpod version ......: $libgpod_version
libcurl ..............: $have_curl
vorbisfile ...........: $have_ogg
diff --git a/libgtkpod/autodetection.c b/libgtkpod/autodetection.c
index 94ac6a2..6c4020b 100644
--- a/libgtkpod/autodetection.c
+++ b/libgtkpod/autodetection.c
@@ -32,17 +32,13 @@
#include <stdio.h>
#include <string.h>
#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
#include "autodetection.h"
#include "gp_itdb.h"
#include "gtkpod_app_iface.h"
#include "misc.h"
#include "prefs.h"
-
-#ifdef HAVE_GIO
-#include <gio/gio.h>
-#endif
-
#undef DEBUG_AUTO
#ifdef DEBUG_AUTO
# define _TO_STR(x) #x
@@ -116,7 +112,6 @@ static iTunesDB *ad_find_repository_with_mountpoint (const
gchar *mountpoint)
-#ifdef HAVE_GIO
typedef struct _AutoDetect AutoDetect;
static gboolean ad_timeout_cb (gpointer data);
@@ -328,11 +323,3 @@ static gboolean ad_timeout_cb (gpointer data)
return TRUE;
}
-
-#else
-/* No GIO support */
-
-void autodetection_init ()
-{
-}
-#endif
diff --git a/libgtkpod/gp_itdb.c b/libgtkpod/gp_itdb.c
index b7747b1..e5ac01b 100644
--- a/libgtkpod/gp_itdb.c
+++ b/libgtkpod/gp_itdb.c
@@ -762,9 +762,6 @@ void gp_init(int argc, char *argv[]) {
if (!prefs_get_int_value("itdb_0_type", NULL)) {
/* databases have not been set up previously -- take care of
this */
-#ifndef HAVE_GIO
- gchar *mountpoint;
-#endif
gchar *filename;
/* Local database */
@@ -780,18 +777,6 @@ void gp_init(int argc, char *argv[]) {
prefs_set_string("itdb_1_name", _("Podcasts"));
prefs_set_string("itdb_1_filename", filename);
g_free(filename);
-
-#ifndef HAVE_GIO
- /* iPod database -- only set up if autodetection is not active */
- mountpoint = prefs_get_string ("initial_mountpoint");
- filename = g_build_filename (cfgdir, "iTunesDB", NULL);
- prefs_set_int ("itdb_2_type", GP_ITDB_TYPE_IPOD);
- prefs_set_string ("itdb_2_name", _("iPod"));
- prefs_set_string ("itdb_2_filename", filename);
- prefs_set_string ("itdb_2_mountpoint", mountpoint);
- g_free (mountpoint);
- g_free (filename);
-#endif
}
for (i = 0;; ++i) {
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
