[gtk+] gtk: Add deprecation guards for newest pango deprecations



commit 9df707da223f081475737829b2fadc253fead9ee
Author: Benjamin Otte <otte redhat com>
Date:   Thu May 28 16:54:03 2015 +0200

    gtk: Add deprecation guards for newest pango deprecations

 gtk/gtkimmodule.c    |    2 ++
 gtk/gtkmodules.c     |    4 ++++
 gtk/queryimmodules.c |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 1a90a22..51044eb 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -404,6 +404,7 @@ gtk_im_module_initialize (void)
       return;
     }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   while (!have_error && pango_read_line (file, line_buf))
     {
       const char *p;
@@ -485,6 +486,7 @@ gtk_im_module_initialize (void)
          have_error = TRUE;
        }
     }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   if (have_error)
     {
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 640be7b..1af2c1d 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -77,7 +77,9 @@ get_module_path (void)
 
   g_free (default_dir);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   result = pango_split_file_list (module_path);
+G_GNUC_END_IGNORE_DEPRECATIONS
   g_free (module_path);
 
   return result;
@@ -417,7 +419,9 @@ load_modules (const char *module_str)
 
   GTK_NOTE (MODULES, g_print ("Loading module list: %s\n", module_str));
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   module_names = pango_split_file_list (module_str);
+G_GNUC_END_IGNORE_DEPRECATIONS
   for (i = 0; module_names[i]; i++) 
     module_list = load_module (module_list, module_names[i]);
 
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 58ebe5c..155be81 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -190,7 +190,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
       g_string_append_printf (contents, "# ModulesPath = %s\n#\n", path);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       dirs = pango_split_file_list (path);
+G_GNUC_END_IGNORE_DEPRECATIONS
       dirs_done = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
 
       for (i = 0; dirs[i]; i++)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]