[glade] removed g_resources_lookup_data() use, since now we depend on gtk 3.4 which has gtk_builder_add_from
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] removed g_resources_lookup_data() use, since now we depend on gtk 3.4 which has gtk_builder_add_from
- Date: Sat, 12 May 2012 15:30:10 +0000 (UTC)
commit 940b293c5509c4c8ff3dce9159dd8025376fbad9
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Wed May 9 15:29:14 2012 -0300
removed g_resources_lookup_data() use, since now we depend on gtk 3.4 which has
gtk_builder_add_from_resource()
src/glade-window.c | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/src/glade-window.c b/src/glade-window.c
index 2e7b356..afc6404 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2982,25 +2982,12 @@ glade_window_constructed (GObject *object)
G_OBJECT_CLASS (glade_window_parent_class)->constructed (object);
/* Build UI */
-#if HAVE_GTK_BUILDER_ADD_FROM_RESOURCE
builder = gtk_builder_new ();
if (gtk_builder_add_from_resource (builder, "/org/gnome/glade/glade.glade", &error) == 0)
- {
- g_warning ("gtk_builder_add_from_resource() failed %s", (error) ? error->message : "");
- return;
- }
-#else
- {
- /*TODO: remove this once we depend on gtk 3.4 */
- GBytes *glade_ui = g_resources_lookup_data ("/org/gnome/glade/glade.glade",
- G_RESOURCE_LOOKUP_FLAGS_NONE,
- NULL);
- if (glade_ui == NULL) return;
-
- builder = gtk_builder_new ();
- gtk_builder_add_from_string (builder, g_bytes_get_data (glade_ui, NULL), -1, NULL);
- }
-#endif
+ {
+ g_warning ("gtk_builder_add_from_resource() failed %s", (error) ? error->message : "");
+ return;
+ }
window = GLADE_WINDOW (object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]