diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-09 15:11:18 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-09 15:11:18 +0900 |
| commit | 8359c868acee1f46036f07d7b8813f0173a66a01 (patch) | |
| tree | 3d81396dbc13e7d99d1add4bb680075fdde2ab53 /gladeui/glade-inspector.c | |
| parent | 53797de6b53a1565bdd69e6c26bb34d28fcb0416 (diff) | |
| parent | 928784bdc3f8f47f75dedab057f8254d1fdd8cca (diff) | |
| download | glade-8359c868acee1f46036f07d7b8813f0173a66a01.tar.gz | |
Merge branch 'master' into offscreen
Conflicts:
gladeui/glade-named-icon-chooser-dialog.c
Diffstat (limited to 'gladeui/glade-inspector.c')
| -rw-r--r-- | gladeui/glade-inspector.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c index 9fd64950..a4781bc7 100644 --- a/gladeui/glade-inspector.c +++ b/gladeui/glade-inspector.c @@ -47,7 +47,11 @@ #include <string.h> #include <glib/gi18n-lib.h> +#if GTK_CHECK_VERSION (2, 21, 8) +#include <gdk/gdkkeysyms-compat.h> +#else #include <gdk/gdkkeysyms.h> +#endif #define GLADE_INSPECTOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ GLADE_TYPE_INSPECTOR, \ |