Fix compilation error using python2.7

[python-purple] / signal_cbs.pxd

diff --git a/signal_cbs.pxd b/signal_cbs.pxd
index 5cc1075..9d9a078 100644 (file)
--- a/signal_cbs.pxd
+++ b/signal_cbs.pxd
@@ -17,10 +17,11 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cimport purple
-
 signal_cbs = {}
 
+cdef extern from *:
+    ctypedef char const_gchar "const gchar"
+
 cdef void signal_signed_on_cb(connection.PurpleConnection *gc, \
         glib.gpointer null):
     """
@@ -43,7 +44,7 @@ cdef void signal_signed_on_cb(connection.PurpleConnection *gc, \
     else:
         protocol_id = c_protocol_id
 
-    if signal_cbs.has_key("signed-on"):
+    if "signed-on" in signal_cbs:
         (<object> signal_cbs["signed-on"])(username, protocol_id)
 
 cdef void signal_signed_off_cb(connection.PurpleConnection *gc, \
@@ -68,17 +69,32 @@ cdef void signal_signed_off_cb(connection.PurpleConnection *gc, \
     else:
         protocol_id = c_protocol_id
 
-    if signal_cbs.has_key("signed-off"):
+    if "signed-off" in signal_cbs:
         (<object> signal_cbs["signed-off"])(username, protocol_id)
 
 cdef void signal_connection_error_cb(connection.PurpleConnection *gc, \
-        connection.PurpleConnectionError err, char *c_desc):
+        connection.PurpleConnectionError err, const_gchar *c_desc):
     """
     Emitted when a connection error occurs, before signed-off.
     @params gc   The connection on which the error has occured
     @params err  The error that occured
     @params desc A description of the error, giving more information
     """
+    cdef account.PurpleAccount *acc = connection.purple_connection_get_account(gc)
+    cdef char *c_username = NULL
+    cdef char *c_protocol_id = NULL
+
+    c_username = <char *> account.purple_account_get_username(acc)
+    if c_username:
+        username = <char *> c_username
+    else:
+        username = None
+
+    c_protocol_id = <char *> account.purple_account_get_protocol_id(acc)
+    if c_protocol_id:
+        protocol_id = <char *> c_protocol_id
+    else:
+        protocol_id = None
 
     short_desc = {
         0: "Network error",
@@ -97,15 +113,16 @@ cdef void signal_connection_error_cb(connection.PurpleConnection *gc, \
         13: "SSL certificate fingerprint mismatch",
         14: "SSL certificate self signed",
         15: "SSL certificate other error",
-        16: "Other error" }[<int>err]
+        16: "Other error" }[<int> err]
 
-    if c_desc == NULL:
-        desc = None
+    if c_desc:
+        desc = str(<char *> c_desc)
     else:
-        desc = c_desc
+        desc = None
 
-    if signal_cbs.has_key("connection-error"):
-        (<object> signal_cbs["connection-error"])(short_desc, desc)
+    if "connection-error" in signal_cbs:
+        (<object> signal_cbs["connection-error"])(username, protocol_id, \
+                short_desc, desc)
 
 cdef void signal_buddy_signed_on_cb(blist.PurpleBuddy *buddy):
     """
@@ -127,7 +144,7 @@ cdef void signal_buddy_signed_on_cb(blist.PurpleBuddy *buddy):
     else:
         alias = c_alias
 
-    if signal_cbs.has_key("buddy-signed-on"):
+    if "buddy-signed-on" in signal_cbs:
         (<object> signal_cbs["buddy-signed-on"])(name, alias)
 
 cdef void signal_buddy_signed_off_cb(blist.PurpleBuddy *buddy):
@@ -150,7 +167,7 @@ cdef void signal_buddy_signed_off_cb(blist.PurpleBuddy *buddy):
     else:
         alias = c_alias
 
-    if signal_cbs.has_key("buddy-signed-off"):
+    if "buddy-signed-off" in signal_cbs:
         (<object> signal_cbs["buddy-signed-off"])(name, alias)
 
 cdef glib.gboolean signal_receiving_im_msg_cb(account.PurpleAccount *account, \
@@ -179,7 +196,7 @@ cdef glib.gboolean signal_receiving_im_msg_cb(account.PurpleAccount *account, \
 
     stripped = util.purple_markup_strip_html(message[0])
 
-    if signal_cbs.has_key("receiving-im-msg"):
+    if "receiving-im-msg" in signal_cbs:
         return (<object> signal_cbs["receiving-im-msg"])(sender[0], alias, stripped)
 
 cdef void jabber_receiving_xmlnode_cb(connection.PurpleConnection *gc, \
@@ -189,5 +206,5 @@ cdef void jabber_receiving_xmlnode_cb(connection.PurpleConnection *gc, \
     """
     message = xmlnode.xmlnode_to_str(packet[0], NULL)
 
-    if signal_cbs.has_key("jabber-receiving-xmlnode"):
+    if "jabber-receiving-xmlnode" in signal_cbs:
         (<object> signal_cbs["jabber-receiving-xmlnode"])(message)