luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 12:23:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject.py: Simplify and reduce code a bit

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-09-19 15:24:16 -04:00
parent 4e512a1af8
commit bfbe7127d5
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gobject/gobject.py
View File

@ -171,6 +171,14 @@ class SignalFrame:
return s return s
def get_detailed_signal_from_frame(self, frame, signal):
detail = self.read_var (frame, "detail")
detail = glib.g_quark_to_string (detail)
if detail is not None:
return signal + ":" + detail
else:
return detail
def describe (self, stream, full): def describe (self, stream, full):
instances = [] instances = []
signals = [] signals = []
@ -182,11 +190,8 @@ class SignalFrame:
node = self.read_var (frame, "node") node = self.read_var (frame, "node")
if node: if node:
signal = node["name"].string() signal = node["name"].string()
detail = self.read_var (frame, "detail") signal = self.get_detailed_signal_from_frame(frame, signal)
detail = glib.g_quark_to_string (detail) self.append(signals, signal)
if detail != None:
signal = signal + ":" + detail
self.append (signals, signal)
if name == "g_signal_emitv": if name == "g_signal_emitv":
instance_and_params = self.read_var (frame, "instance_and_params") instance_and_params = self.read_var (frame, "instance_and_params")
@ -196,10 +201,7 @@ class SignalFrame:
id = self.read_var (frame, "signal_id") id = self.read_var (frame, "signal_id")
signal = get_signal_name (id) signal = get_signal_name (id)
if signal: if signal:
detail = self.read_var (frame, "detail") signal = self.get_detailed_signal_from_frame(frame, signal)
detail = glib.g_quark_to_string (detail)
if detail != None:
signal = signal + ":" + detail
self.append (signals, signal) self.append (signals, signal)
if name == "g_signal_emit_valist" or name == "g_signal_emit": if name == "g_signal_emit_valist" or name == "g_signal_emit":
@ -207,10 +209,7 @@ class SignalFrame:
id = self.read_var (frame, "signal_id") id = self.read_var (frame, "signal_id")
signal = get_signal_name (id) signal = get_signal_name (id)
if signal: if signal:
detail = self.read_var (frame, "detail") signal = self.get_detailed_signal_from_frame(frame, signal)
detail = glib.g_quark_to_string (detail)
if detail != None:
signal = signal + ":" + detail
self.append (signals, signal) self.append (signals, signal)
if name == "g_signal_emit_by_name": if name == "g_signal_emit_by_name":