← Back to branch summary

~attente/glib/gicon-upstream

« back to all changes in this revision

Viewing changes to glib/glib.py

  • Committer: Package Import Robot
  • Author(s): Iain Lane, Josselin Mouette, Iain Lane
  • Date: 2012-10-17 11:51:14 UTC
  • mfrom: (172.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20121017115114-gqog9lavags5afi1
Tags: 2.34.1-1
https://launchpad.net/bugs/1044322
[ Josselin Mouette ]
* Require libelfg0-dev, not libelf-dev which has nothing to do with 
  it.

[ Iain Lane ]
* New upstream release
  + GTimeZone support for zoneinfo version 1
  + Leak in glib-compile-resources
  + g_settings_bind: use canonical property name
  + Port gio tests from pygobject to pygi
* Switch python-gobject-2 BD to python-gi, folowing porting of tests. 
* debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
  Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
  called with a NULL GDBusConnection. (LP: #1044322)

Show diffs side-by-side

added added

removed removed

Lines of Context:
glib/glib.py
10
10
    quark = long(quark)
11
11
    if quark == 0:
12
12
        return None
13
 
    val = read_global_var ("g_quarks")
14
 
    max_q = long(read_global_var ("g_quark_seq_id"))
 
13
    try:
 
14
        val = read_global_var ("quarks")
 
15
        max_q = long(read_global_var ("quark_seq_id"))
 
16
    except:
 
17
        try:
 
18
            val = read_global_var ("g_quarks")
 
19
            max_q = long(read_global_var ("g_quark_seq_id"))
 
20
        except:
 
21
            return None;
15
22
    if quark < max_q:
16
23
        return val[quark].string()
17
24
    return None