[glib] Fix gdb script for new quark variable names

[Benjamin Otte <otte src gnome org>]

commit 685259dfea99c16bdd97f596af6548f83cb5669a
Author: Benjamin Otte <otte redhat com>
Date:   Thu Sep 27 15:31:46 2012 +0200

    Fix gdb script for new quark variable names
    
    ... and don't spam stderr with exceptions if someone renames things
    again.
    
    Last but not least, keep the old names as a fallback, so that LD_PRELOAD
    with an older libglib still works.

 glib/glib.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/glib/glib.py b/glib/glib.py
index 9a47d52..de763ae 100644
--- a/glib/glib.py
+++ b/glib/glib.py
@@ -10,8 +10,15 @@ def g_quark_to_string (quark):
     quark = long(quark)
     if quark == 0:
         return None
-    val = read_global_var ("g_quarks")
-    max_q = long(read_global_var ("g_quark_seq_id"))
+    try:
+        val = read_global_var ("quarks")
+        max_q = long(read_global_var ("quark_seq_id"))
+    except:
+        try:
+            val = read_global_var ("g_quarks")
+            max_q = long(read_global_var ("g_quark_seq_id"))
+        except:
+            return None;
     if quark < max_q:
         return val[quark].string()
     return None