[gedit] Silence the new GTK+ deprecations as we cannot fix them now
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Silence the new GTK+ deprecations as we cannot fix them now
- Date: Mon, 1 Jul 2013 18:23:46 +0000 (UTC)
commit 83665f0c86dbd2369ee6c30116fbc3f50a59b75e
Author: Garrett Regier <garrettregier gmail com>
Date: Mon Jul 1 10:54:21 2013 -0700
Silence the new GTK+ deprecations as we cannot fix them now
Many APIs which gedit requires are now deprecated.
Also, fix files to correctly #include <config.h> which is required
to silence the warnings.
configure.ac | 2 ++
gedit/gedit-settings.c | 4 ++++
.../gedit-file-browser-message-activation.c | 4 ++++
.../gedit-file-browser-message-add-context-item.c | 4 ++++
.../gedit-file-browser-message-add-filter.c | 4 ++++
.../messages/gedit-file-browser-message-get-root.c | 4 ++++
.../messages/gedit-file-browser-message-get-view.c | 4 ++++
.../gedit-file-browser-message-id-location.c | 4 ++++
.../messages/gedit-file-browser-message-id.c | 4 ++++
.../gedit-file-browser-message-set-emblem.c | 4 ++++
.../gedit-file-browser-message-set-markup.c | 4 ++++
.../messages/gedit-file-browser-message-set-root.c | 4 ++++
tools/generate-message.py | 5 +++++
13 files changed, 51 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 57c8af9..b76f669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,8 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [minimum gdk version])
+
GNOME_COMPILE_WARNINGS([maximum])
if test "$USE_MAINTAINER_MODE" = "yes"; then
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 953b78d..0d78ba7 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <gtksourceview/gtksource.h>
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
b/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
index c8ef9c8..29b293d 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-activation.h"
#define GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GEDIT_TYPE_FILE_BROWSER_MESSAGE_ACTIVATION, GeditFileBrowserMessageActivationPrivate))
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-add-context-item.c
b/plugins/filebrowser/messages/gedit-file-browser-message-add-context-item.c
index 7aaddb3..6816139 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-add-context-item.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-add-context-item.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-add-context-item.h"
#include <gtk/gtk.h>
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
b/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
index d3ff9ca..52b606c 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-add-filter.h"
#define GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GEDIT_TYPE_FILE_BROWSER_MESSAGE_ADD_FILTER, GeditFileBrowserMessageAddFilterPrivate))
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
b/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
index 0fb17ab..720ecf2 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-get-root.h"
#include "gio/gio.h"
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
b/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
index 58312ec..f331cae 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-get-view.h"
#include "plugins/filebrowser/gedit-file-browser-view.h"
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
b/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
index 9b13a54..4da1762 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
@@ -22,6 +22,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-id-location.h"
#include "gio/gio.h"
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-id.c
b/plugins/filebrowser/messages/gedit-file-browser-message-id.c
index e3f90d6..10e4e5a 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-id.h"
#define GEDIT_FILE_BROWSER_MESSAGE_ID_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GEDIT_TYPE_FILE_BROWSER_MESSAGE_ID, GeditFileBrowserMessageIdPrivate))
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
b/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
index 927ce8b..bd64e0e 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-set-emblem.h"
#define GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GEDIT_TYPE_FILE_BROWSER_MESSAGE_SET_EMBLEM, GeditFileBrowserMessageSetEmblemPrivate))
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
b/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
index 8d87438..1bb7c2d 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-set-markup.h"
#define GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GEDIT_TYPE_FILE_BROWSER_MESSAGE_SET_MARKUP, GeditFileBrowserMessageSetMarkupPrivate))
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
b/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
index fdfba3d..4898c0c 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
@@ -21,6 +21,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "gedit-file-browser-message-set-root.h"
#include "gio/gio.h"
diff --git a/tools/generate-message.py b/tools/generate-message.py
index 7c67cfd..646b78e 100755
--- a/tools/generate-message.py
+++ b/tools/generate-message.py
@@ -585,6 +585,11 @@ class Message:
elif options.lgpl:
self._write_lgpl(options, fname)
+ self._write("#ifdef HAVE_CONFIG_H")
+ self._write("#include <config.h>")
+ self._write("#endif")
+ self._write()
+
self._write('#include "%s.h"', self.filename)
for inc in self.includes:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]