[gtk+] queryimmodules: Localize suppressed deprecation
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] queryimmodules: Localize suppressed deprecation
- Date: Sat, 3 May 2014 00:53:26 +0000 (UTC)
commit 4cdc32974a9d4b63a4541ecd2d50b8a67e52a9c6
Author: Matthias Clasen <mclasen redhat com>
Date: Fri May 2 18:48:36 2014 -0400
queryimmodules: Localize suppressed deprecation
Drop the blanket GDK_DISABLE_DEPRECATION_WARNINGS and avoid
deprecated API as much as possible.
gtk/queryimmodules.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index f4e561d..58ebe5c 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -37,8 +37,6 @@
#include "gtk/gtkimcontextinfo.h"
#include "gtk/gtkversion.h"
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-
#include "gtk/deprecated/gtkrc.h"
static void
@@ -165,7 +163,9 @@ int main (int argc, char **argv)
if (argc > 1 && strcmp (argv[1], "--update-cache") == 0)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
cache_file = gtk_rc_get_im_module_file ();
+G_GNUC_END_IGNORE_DEPRECATIONS
first_file = 2;
}
@@ -184,7 +184,9 @@ int main (int argc, char **argv)
int i;
GHashTable *dirs_done;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
path = gtk_rc_get_im_module_path ();
+G_GNUC_END_IGNORE_DEPRECATIONS
g_string_append_printf (contents, "# ModulesPath = %s\n#\n", path);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]