diff options
| author | Stefano Karapetsas <[email protected]> | 2014-02-17 10:59:47 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-02-17 10:59:47 +0100 |
| commit | 43895e3aa9292d6e7a429126527cc43f50b93483 (patch) | |
| tree | 248c9f73e9e9ae30c4714127aa29774bdcfc52b5 /src/terminal-util.c | |
| parent | dafab9dd2196739bf283ac0207a60168734e3105 (diff) | |
| parent | d6483a80a9eef3a9ba4ea1394558ebbaa39a7cbe (diff) | |
| download | mate-terminal-43895e3aa9292d6e7a429126527cc43f50b93483.tar.bz2 mate-terminal-43895e3aa9292d6e7a429126527cc43f50b93483.tar.xz | |
Merge pull request #55 from markbt/warnings
Fix some warnings.
Diffstat (limited to 'src/terminal-util.c')
| -rw-r--r-- | src/terminal-util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/terminal-util.c b/src/terminal-util.c index a909a53..c847595 100644 --- a/src/terminal-util.c +++ b/src/terminal-util.c @@ -47,6 +47,8 @@ #if GTK_CHECK_VERSION(3, 0, 0) #define GDK_WINDOW_XWINDOW GDK_WINDOW_XID #define GDK_DRAWABLE_XID GDK_WINDOW_XID +#else + #define gdk_error_trap_pop_ignored gdk_error_trap_pop #endif void @@ -609,7 +611,7 @@ setup_ignore_host_env (GHashTable *env_table, GSList *ignore; gchar **ignore_strv = g_settings_get_strv (settings, "ignore-hosts"); - ignore = terminal_gsettings_strv_to_gslist (ignore_strv); + ignore = terminal_gsettings_strv_to_gslist ((const gchar *const *)ignore_strv); if (ignore) { GString *buf = g_string_sized_new (64); @@ -1205,7 +1207,7 @@ terminal_util_x11_window_is_minimized (GdkWindow *window) gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"), 0, G_MAXLONG, False, XA_ATOM, &type, &format, &nitems, &bytes_after, &data); - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); if (type != None) { |