Commit 3ffc038e authored by James Liggett's avatar James Liggett

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.
parent d1ebbb4c
......@@ -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)
......
......@@ -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 \
......
......@@ -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;
}
}
......
......@@ -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)
{
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment