[anjuta/git-shell: 148/151] libanjuta: Adapt to API and build system changes

[James Liggett <jrliggett src gnome org>]

commit 3ffc038ef33367effe0696732719dd9fc0d6af5e
Author: James Liggett <jrliggett cox net>
Date:   Sat Nov 13 01:19:04 2010 -0800

    libanjuta: Adapt to API and build system changes
    
    First, include GDL as a build dependency of libanjuta so that AnjutaDock can
    work again. Also adapt to some GSEAL related API changes for Gtk 3.0 in
    AnjutaDropEntry and friends.
    
    These changes should make the git shell version of libanjuta build again.

 configure.ac                       |    2 +-
 libanjuta/Makefile.am              |    4 +++-
 libanjuta/anjuta-drop-entry.c      |    8 +++++---
 libanjuta/anjuta-file-drop-entry.c |    3 ++-
 libanjuta/anjuta-file-list.c       |    3 ++-
 5 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 555b803..03fb294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,7 +320,7 @@ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
 
 dnl Setup Anjuta Library flags
 dnl --------------------------
-LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
+LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
 LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta-3.la'
 AC_SUBST(LIBANJUTA_CFLAGS)
 AC_SUBST(LIBANJUTA_LIBS)
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index 20f8ca7..5c50ed9 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(ANJUTA_CFLAGS) \
 	$(XML_CFLAGS) \
+	$(GDL_CFLAGS) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DPACKAGE_PIXMAPS_DIR="\"$(datadir)/pixmaps/$(PACKAGE)\"" \
 	-DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
@@ -20,7 +21,8 @@ libanjuta_3_la_LDFLAGS = $(ANJUTA_LDFLAGS)
 libanjuta_3_la_LIBADD = \
 	interfaces/libanjuta-interfaces.la \
 	$(ANJUTA_LIBS) \
-	$(XML_LIBS)
+	$(XML_LIBS) \
+	$(GDL_LIBS)
 
 libanjuta_3_la_SOURCES= \
 	anjuta-enum-types.h \
diff --git a/libanjuta/anjuta-drop-entry.c b/libanjuta/anjuta-drop-entry.c
index bae0804..6f678f8 100644
--- a/libanjuta/anjuta-drop-entry.c
+++ b/libanjuta/anjuta-drop-entry.c
@@ -72,13 +72,15 @@ anjuta_drop_entry_drag_data_received (GtkWidget *widget,
 	success = FALSE;
 	delete = FALSE;
 
-	if ((data != NULL) && (data->length >= 0))
+	if ((data != NULL) && 
+	    (gtk_selection_data_get_length (data) >= 0))
 	{
-		delete = (context->action == GDK_ACTION_MOVE);
+		delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE);
 
 		if (target_type == DND_TYPE_STRING)
 		{
-			anjuta_entry_set_text (ANJUTA_ENTRY (widget), (const gchar *) data->data);
+			anjuta_entry_set_text (ANJUTA_ENTRY (widget), 
+			                       (const gchar *) gtk_selection_data_get_data (data));
 			success = TRUE;
 		}
 	}
diff --git a/libanjuta/anjuta-file-drop-entry.c b/libanjuta/anjuta-file-drop-entry.c
index 7a93459..ca23859 100644
--- a/libanjuta/anjuta-file-drop-entry.c
+++ b/libanjuta/anjuta-file-drop-entry.c
@@ -128,7 +128,8 @@ anjuta_file_drop_entry_drag_data_received (GtkWidget *widget,
 	self = ANJUTA_FILE_DROP_ENTRY (widget);
 	success = FALSE;
 
-	if ((data != NULL) && (data->length >= 0))
+	if ((data != NULL) && 
+	    (gtk_selection_data_get_length (data) >= 0))
 	{
 		if (target_type == 0)
 		{
diff --git a/libanjuta/anjuta-file-list.c b/libanjuta/anjuta-file-list.c
index cc58e8b..878e2f0 100644
--- a/libanjuta/anjuta-file-list.c
+++ b/libanjuta/anjuta-file-list.c
@@ -164,7 +164,8 @@ on_list_view_drag_data_received (GtkWidget *list_view, GdkDragContext *context,
 	
 	success = FALSE;
 
-	if ((data != NULL) && (data->length >= 0))
+	if ((data != NULL) && 
+	    (gtk_selection_data_get_length (data) >= 0))
 	{
 		if (target_type == 0)
 		{