[glib] gobject.py: Simplify and reduce code a bit
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gobject.py: Simplify and reduce code a bit
- Date: Tue, 31 Dec 2013 20:40:55 +0000 (UTC)
commit bfbe7127d539176ca625fbf052cca9cf4cfc42d8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Sep 19 15:24:16 2013 -0400
gobject.py: Simplify and reduce code a bit
gobject/gobject.py | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/gobject/gobject.py b/gobject/gobject.py
index 065bf60..5e8ff67 100644
--- a/gobject/gobject.py
+++ b/gobject/gobject.py
@@ -171,6 +171,14 @@ class SignalFrame:
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):
instances = []
signals = []
@@ -182,11 +190,8 @@ class SignalFrame:
node = self.read_var (frame, "node")
if node:
signal = node["name"].string()
- detail = self.read_var (frame, "detail")
- detail = glib.g_quark_to_string (detail)
- if detail != None:
- signal = signal + ":" + detail
- self.append (signals, signal)
+ signal = self.get_detailed_signal_from_frame(frame, signal)
+ self.append(signals, signal)
if name == "g_signal_emitv":
instance_and_params = self.read_var (frame, "instance_and_params")
@@ -196,10 +201,7 @@ class SignalFrame:
id = self.read_var (frame, "signal_id")
signal = get_signal_name (id)
if signal:
- detail = self.read_var (frame, "detail")
- detail = glib.g_quark_to_string (detail)
- if detail != None:
- signal = signal + ":" + detail
+ signal = self.get_detailed_signal_from_frame(frame, signal)
self.append (signals, signal)
if name == "g_signal_emit_valist" or name == "g_signal_emit":
@@ -207,10 +209,7 @@ class SignalFrame:
id = self.read_var (frame, "signal_id")
signal = get_signal_name (id)
if signal:
- detail = self.read_var (frame, "detail")
- detail = glib.g_quark_to_string (detail)
- if detail != None:
- signal = signal + ":" + detail
+ signal = self.get_detailed_signal_from_frame(frame, signal)
self.append (signals, signal)
if name == "g_signal_emit_by_name":
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]