commit adc81c74d1ce86feb06b74da8dc7448184c5a66d
Author: phantomjinx <[email protected]>
Date: Tue Aug 2 21:42:22 2011 +0100
With move to gtk 3 assume gsealed gdk
* Assume a gdk library greater than or equal to 3.0.11
* Assume the gdk library is gsealed and no longer any need for
compatibility macros for gdk_dragging.
* These macros will be maintained in the gtk2 branches.
* Bug identified and investigate in #3323692 - Thanks to dimstar for the
investigation and suggested fix.
configure.ac | 18 ++++--------------
plugins/cover_display/display_coverart.c | 6 ------
plugins/details_editor/details.c | 6 ------
plugins/playlist_display/display_playlists.c | 6 ------
plugins/track_display/display_tracks.c | 6 ------
5 files changed, 4 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8261903..a2a9069 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,7 @@ fi
dnl check for required libs that are managed with pkg-config
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.8,, [AC_MSG_FAILURE([***
$GTK_PKG_ERRORS])])
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GLIB_PKG_ERRORS])])
+PKG_CHECK_MODULES(GDK, gdk-3.0 >= 3.0.11,, [AC_MSG_FAILURE([***
$GDK_PKG_ERRORS])])
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GMODULE_PKG_ERRORS])])
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GTHREAD_PKG_ERRORS])])
PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.7.0,, [AC_MSG_FAILURE([***
$LIBGPOD_PKG_ERRORS])])
@@ -87,24 +88,13 @@ PKG_CHECK_MODULES(LIBGDL, gdl-3.0 >= 3.0.0,,
[AC_MSG_FAILURE([*** $LIBGDL_PKG_ER
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.28.5,, [AC_MSG_FAILURE([***
$GIO_PKG_ERRORS])])
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.7.7,, [AC_MSG_FAILURE([***
$LIBXML_PKG_ERRORS])])
-dnl Check if GDK has GSEAL for GdkDragContext
-PKG_CHECK_MODULES(GSEALED_GDK, gdk-2.0 >= 2.21.0, have_gsealed_gdk=yes,
have_gsealed_gdk=no)
-
-AM_CONDITIONAL(HAVE_GSEALED_GDK, test "x$have_gsealed_gdk" = "xyes")
-if test "x$have_gsealed_gdk" = "xyes"; then
- AC_DEFINE(HAVE_GSEALED_GDK, 1, [Define if GDK has GSEAL])
- dnl Preparing for GTK3 transition
- GTK_CLEANLINESS_FLAGS="-DG_DISABLE_SINGLE_INCLUDES
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
- GTK_CLEANLINESS_FLAGS="$GTK_CLEANLINESS_FLAGS -DG_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED"
- GTK_CLEANLINESS_FLAGS="$GTK_CLEANLINESS_FLAGS -DGSEAL_ENABLE"
-fi
-
+GTK_CLEANLINESS_FLAGS="-DG_DISABLE_SINGLE_INCLUDES
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
dnl Force C99 mode (no implicit int declarations)
CFLAGS="$CFLAGS -std=gnu99 -Werror-implicit-function-declaration"
-CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS
$LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS $LIBGDL_CFLAGS
$LIBXML_CFLAGS $GTK_CLEANLINESS_FLAGS"
-LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS
$LIBGPOD_LIBS $LIBANJUTA_LIBS $LIBGDL_LIBS $LIBXML_LIBS"
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GDK_CFLAGS $GMODULE_CFLAGS
$GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS
$LIBGDL_CFLAGS $LIBXML_CFLAGS $GTK_CLEANLINESS_FLAGS"
+LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GDK_LIBS $GMODULE_LIBS $GTHREAD_LIBS
$LIBGLADE_LIBS $LIBGPOD_LIBS $LIBANJUTA_LIBS $LIBGDL_LIBS $LIBXML_LIBS"
dnl we need 'flex'
diff --git a/plugins/cover_display/display_coverart.c
b/plugins/cover_display/display_coverart.c
index ffde61c..f108e93 100644
--- a/plugins/cover_display/display_coverart.c
+++ b/plugins/cover_display/display_coverart.c
@@ -43,12 +43,6 @@
#include "fetchcover.h"
#include "cover_display_context_menu.h"
-#ifndef HAVE_GSEALED_GDK
-/* Compatibility macros for previous GDK versions */
-#define gdk_drag_context_get_selected_action(x) ((x)->action)
-#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
-#endif
-
#define DEBUG 0
/* Declarations */
diff --git a/plugins/details_editor/details.c b/plugins/details_editor/details.c
index 03cc281..4e0b48c 100644
--- a/plugins/details_editor/details.c
+++ b/plugins/details_editor/details.c
@@ -43,12 +43,6 @@
#include "details.h"
#include "fetchcover.h"
-#ifndef HAVE_GSEALED_GDK
-/* Compatibility macros for previous GDK versions */
-#define gdk_drag_context_get_selected_action(x) ((x)->action)
-#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
-#endif
-
/* string constants for preferences */
const gchar *DETAILS_WINDOW_NOTEBOOK_PAGE = "details_window_notebook_page";
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index 2dcfcdc..501cf27 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -49,12 +49,6 @@
#include "libgtkpod/gtkpod_app_iface.h"
#include "libgtkpod/prefs.h"
-#ifndef HAVE_GSEALED_GDK
-/* Compatibility macros for previous GDK versions */
-#define gdk_drag_context_get_selected_action(x) ((x)->action)
-#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
-#endif
-
/* pointer to the playlist display's toolbar */
static GtkToolbar *playlist_toolbar = NULL;
/* pointer to the treeview for the playlist display */
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index aac858b..1945309 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -52,12 +52,6 @@
#include "rb_cell_renderer_rating.h"
#include "track_display_context_menu.h"
-#ifndef HAVE_GSEALED_GDK
-/* Compatibility macros for previous GDK versions */
-#define gdk_drag_context_get_selected_action(x) ((x)->action)
-#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
-#endif
-
/* reference to gtkbuilder for use with track plugin */
static GtkBuilder *trackbuilder = NULL;
/* pointer to the container for the track display */
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
