[glade] Avoid calling gtk_stock_list_ids() when gdk_display_get_default() is NULL



commit 20ed06c8cfa0eb7a0397d17243d6af1ca7a43770
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat May 18 18:22:37 2013 +0900

    Avoid calling gtk_stock_list_ids() when gdk_display_get_default() is NULL
    
    This is a workaround to patch GIR builds to work on build machines
    with no DISPLAY.

 gladeui/glade-builtins.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/gladeui/glade-builtins.c b/gladeui/glade-builtins.c
index 6a07441..e38cc2c 100644
--- a/gladeui/glade-builtins.c
+++ b/gladeui/glade-builtins.c
@@ -146,7 +146,6 @@ compare_two_gsi (gconstpointer a, gconstpointer b)
   return strcmp (gsi1->clean_name, gsi2->clean_name);
 }
 
-
 static GArray *
 list_stock_items (gboolean include_images)
 {
@@ -160,6 +159,18 @@ list_stock_items (gboolean include_images)
   GSList *gsi_list = NULL;
   GSList *gsi_list_list = NULL;
 
+  if (gdk_display_get_default () == NULL)
+    {
+      values = g_array_sized_new (TRUE, TRUE, sizeof (GEnumValue), 1);
+
+      value.value = 0;
+      value.value_name = "dummy";
+      value.value_nick = "Dummy";
+      g_array_append_val (values, value);
+
+      return values;
+    }
+
   stock_list = g_slist_reverse (gtk_stock_list_ids ());
 
   values = g_array_sized_new (TRUE, TRUE, sizeof (GEnumValue),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]