AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: Add deprecation guards for newest pango deprecations

Browse Source
This commit is contained in:
Benjamin Otte 2015-05-28 16:54:03 +02:00
parent d921a4fe84
commit 9df707da22
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkimmodule.c
View File

@ -404,6 +404,7 @@ gtk_im_module_initialize (void)
return; return;
} }
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
while (!have_error && pango_read_line (file, line_buf)) while (!have_error && pango_read_line (file, line_buf))
{ {
const char *p; const char *p;
@ -485,6 +486,7 @@ gtk_im_module_initialize (void)
have_error = TRUE; have_error = TRUE;
} }
} }
G_GNUC_END_IGNORE_DEPRECATIONS
if (have_error) if (have_error)
{ {

4
gtk/gtkmodules.c
View File

@ -77,7 +77,9 @@ get_module_path (void)
g_free (default_dir); g_free (default_dir);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
result = pango_split_file_list (module_path); result = pango_split_file_list (module_path);
G_GNUC_END_IGNORE_DEPRECATIONS
g_free (module_path); g_free (module_path);
return result; return result;
@ -417,7 +419,9 @@ load_modules (const char *module_str)
GTK_NOTE (MODULES, g_print ("Loading module list: %s\n", 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); module_names = pango_split_file_list (module_str);
G_GNUC_END_IGNORE_DEPRECATIONS
for (i = 0; module_names[i]; i++) for (i = 0; module_names[i]; i++)
module_list = load_module (module_list, module_names[i]); module_list = load_module (module_list, module_names[i]);

2
gtk/queryimmodules.c
View File

@ -190,7 +190,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
g_string_append_printf (contents, "# ModulesPath = %s\n#\n", path); g_string_append_printf (contents, "# ModulesPath = %s\n#\n", path);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
dirs = pango_split_file_list (path); 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); dirs_done = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
for (i = 0; dirs[i]; i++) for (i = 0; dirs[i]; i++)