[seahorse] Use GDK accessor functions instead direc access (GSEAL fixes)
- From: Adam Schreiber <sadam src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Use GDK accessor functions instead direc access (GSEAL fixes)
- Date: Mon, 19 Jul 2010 01:02:20 +0000 (UTC)
commit b3af3c9c41f54f7a06233e9c014bf21bbb98a0cd
Author: Adam Schreiber <sadam gnome org>
Date: Sun Jul 18 20:59:26 2010 -0400
Use GDK accessor functions instead direc access (GSEAL fixes)
Incorporate changes from Javier Jardon's patch, but add ifdefs so
that building with gdk less than 2.22.0 doesn't break.
src/seahorse-key-manager-store.c | 48 +++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 6 deletions(-)
---
diff --git a/src/seahorse-key-manager-store.c b/src/seahorse-key-manager-store.c
index de966b8..d54d7f3 100644
--- a/src/seahorse-key-manager-store.c
+++ b/src/seahorse-key-manager-store.c
@@ -25,6 +25,7 @@
#include <string.h>
#include <unistd.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "seahorse-gconf.h"
@@ -402,12 +403,25 @@ append_text_column (SeahorseKeyManagerStore *skstore, GtkTreeView *view,
static char *
xds_get_atom_value (GdkDragContext *context)
{
+ #if GTK_CHECK_VERSION (2,22,0)
+ GdkWindow *source_window;
+ #endif
char *ret;
g_return_val_if_fail (context != NULL, NULL);
- g_return_val_if_fail (context->source_window != NULL, NULL);
-
- if (gdk_property_get (context->source_window,
+
+ #if GTK_CHECK_VERSION (2,22,0)
+ source_window = gdk_drag_context_get_source_window (context);
+ g_return_val_if_fail (source_window != NULL, NULL);
+ #else
+ g_return_val_if_fail (context->source_window != NULL, NULL);
+ #endif
+
+ #if GTK_CHECK_VERSION (2,22,0)
+ if (gdk_property_get (source_window,
+ #else
+ if (gdk_property_get (context->source_window,
+ #endif
XDS_ATOM, TEXT_ATOM,
0, MAX_XDS_ATOM_VAL_LEN,
FALSE, NULL, NULL, NULL,
@@ -420,7 +434,15 @@ xds_get_atom_value (GdkDragContext *context)
static gboolean
xds_context_offers_target (GdkDragContext *context, GdkAtom target)
{
- return (g_list_find (context->targets, target) != NULL);
+ #if GTK_CHECK_VERSION (2,22,0)
+ GList *targets;
+
+ targets = gdk_drag_context_list_targets (context);
+
+ return (g_list_find (targets, target) != NULL);
+ #else
+ return (g_list_find (context->targets, target) != NULL);
+ #endif
}
static gboolean
@@ -446,6 +468,10 @@ static gboolean
drag_begin (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore *skstore)
{
GtkTreeView *view = GTK_TREE_VIEW (widget);
+
+ #if GTK_CHECK_VERSION (2,22,0)
+ GdkWindow *source_window;
+ #endif
DBG_PRINT (("drag_begin -->\n"));
@@ -456,10 +482,20 @@ drag_begin (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore
g_list_free (skstore->priv->drag_objects);
skstore->priv->drag_objects = seahorse_key_manager_store_get_selected_objects (view);
- if (skstore->priv->drag_objects)
- gdk_property_change (context->source_window, XDS_ATOM, TEXT_ATOM,
+
+ #if GTK_CHECK_VERSION (2,22,0)
+ if (skstore->priv->drag_objects) {
+ source_window = gdk_drag_context_get_source_window (context);
+ gdk_property_change (source_window, XDS_ATOM, TEXT_ATOM,
+ #else
+ if (skstore->priv->drag_objects)
+ gdk_property_change (context->source_window, XDS_ATOM, TEXT_ATOM,
+ #endif
8, GDK_PROP_MODE_REPLACE, (guchar*)XDS_FILENAME,
strlen (XDS_FILENAME));
+ #if GTK_CHECK_VERSION (2,22,0)
+ }
+ #endif
DBG_PRINT (("drag_begin <--\n"));
return skstore->priv->drag_objects ? TRUE : FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]