[file-roller] make it compile again with GSEAL and *DEPRECATED* macros enabled
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] make it compile again with GSEAL and *DEPRECATED* macros enabled
- Date: Thu, 15 Jul 2010 08:59:54 +0000 (UTC)
commit c7ee8ee04e6dce3dcdedeaa0ec68efffe3b317ec
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Jul 15 10:57:00 2010 +0200
make it compile again with GSEAL and *DEPRECATED* macros enabled
and removed .gitignore from the git repository because it's
generated automatically
.gitignore | 93 --------------------------------------------------
configure.ac | 5 ++-
nautilus/Makefile.am | 6 ---
src/Makefile.am | 6 ---
src/fr-window.c | 10 +++---
5 files changed, 9 insertions(+), 111 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d3516d2..727c895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,10 @@ GNOME_DOC_INIT
dnl ******************************
AC_ARG_ENABLE(deprecations,AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages]),)
-AM_CONDITIONAL(ENABLE_DEPRECATIONS, test "x$enable_deprecations" = xyes)
+if test "x$enable_deprecations" = "xyes"; then
+ DISABLE_DEPRECATED="-DGSEAL_ENABLE -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+fi
+AC_SUBST(DISABLE_DEPRECATED)
dnl ******************************
diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
index ca38cac..75276d6 100644
--- a/nautilus/Makefile.am
+++ b/nautilus/Makefile.am
@@ -1,9 +1,3 @@
-if ENABLE_DEPRECATIONS
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED
-else
-DISABLE_DEPRECATED =
-endif
-
INCLUDES = \
-DFR_DATADIR=\"$(datadir)\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
diff --git a/src/Makefile.am b/src/Makefile.am
index f9b0d49..2e3022b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,12 +8,6 @@ else
MKDTEMP_FILES=
endif
-if ENABLE_DEPRECATIONS
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED
-else
-DISABLE_DEPRECATED =
-endif
-
if RUN_IN_PLACE
privdatadir = $(top_srcdir)/data/
uidir = $(top_srcdir)/data/ui
diff --git a/src/fr-window.c b/src/fr-window.c
index 433c375..bece27f 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -4119,7 +4119,7 @@ file_list_drag_begin (GtkWidget *widget,
g_free (window->priv->drag_base_dir);
window->priv->drag_base_dir = NULL;
- gdk_property_change (context->source_window,
+ gdk_property_change (gdk_drag_context_get_source_window (context),
XDS_ATOM, TEXT_ATOM,
8, GDK_PROP_MODE_REPLACE,
(guchar *) XDS_FILENAME,
@@ -4138,7 +4138,7 @@ file_list_drag_end (GtkWidget *widget,
debug (DEBUG_INFO, "::DragEnd -->\n");
- gdk_property_delete (context->source_window, XDS_ATOM);
+ gdk_property_delete (gdk_drag_context_get_source_window (context), XDS_ATOM);
if (window->priv->drag_error != NULL) {
_gtk_error_dialog_run (GTK_WINDOW (window),
@@ -4175,9 +4175,9 @@ get_xds_atom_value (GdkDragContext *context)
char *ret;
g_return_val_if_fail (context != NULL, NULL);
- g_return_val_if_fail (context->source_window != NULL, NULL);
+ g_return_val_if_fail (gdk_drag_context_get_source_window (context) != NULL, NULL);
- if (gdk_property_get (context->source_window,
+ if (gdk_property_get (gdk_drag_context_get_source_window (context),
XDS_ATOM, TEXT_ATOM,
0, MAX_XDS_ATOM_VAL_LEN,
FALSE, NULL, NULL, NULL,
@@ -4192,7 +4192,7 @@ static gboolean
context_offers_target (GdkDragContext *context,
GdkAtom target)
{
- return (g_list_find (context->targets, target) != NULL);
+ return (g_list_find (gdk_drag_context_list_targets (context), target) != NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]