[glade3] * gladeui/glade-inspector.c, gladeui/glade-named-icon-chooser-dialog.c: Some build fixes to help c
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3] * gladeui/glade-inspector.c, gladeui/glade-named-icon-chooser-dialog.c: Some build fixes to help c
- Date: Tue, 21 Sep 2010 04:39:05 +0000 (UTC)
commit 45f902d4ae544f0d04c5400707a7f8b46d931551
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Tue Sep 21 13:41:37 2010 +0900
* gladeui/glade-inspector.c, gladeui/glade-named-icon-chooser-dialog.c:
Some build fixes to help compile against GTK+ 3.0
ChangeLog | 5 +++++
gladeui/glade-inspector.c | 4 ++++
gladeui/glade-named-icon-chooser-dialog.c | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4ce96df..7df5aaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30 Matthias Clasen <mclasen redhat com>
+
+ * gladeui/glade-inspector.c, gladeui/glade-named-icon-chooser-dialog.c:
+ Some build fixes to help compile against GTK+ 3.0
+
2010-08-30 Tristan Van Berkom <tristanvb openismus com>
* plugins/gtk+/glade-gtk.c: Enable GtkAssistant(child):complete property
diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c
index 64fbb8e..57b722e 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, \
diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c
index 0c33aba..fb49aaa 100644
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@ -1365,9 +1365,9 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Named Icon Chooser"));
gtk_window_set_default_size (GTK_WINDOW (dialog), 610, 480);
-
+#if !GTK_CHECK_VERSION (2, 21, 8)
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
+#endif
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
gtk_box_set_spacing (GTK_BOX (content_area), 12);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]