Nullclient.py: changing mainloop

Use new ecore mainloop instead of glib one.

Signed-off-by: Anderson Briglia <anderson.briglia@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1286 596f6dd7-e928-0410-a184-9e12fd12cf7e

diff --git a/c_purple.c b/c_purple.c
index 4d0a740..fab5c9f 100644 (file)
--- a/c_purple.c
+++ b/c_purple.c
@@ -91,8 +91,3 @@ void connect_to_signals_for_demonstration_purposes_only(void)
        purple_signal_connect(purple_connections_get_handle(), "signed-on", &handle,
                                PURPLE_CALLBACK(signed_on), NULL);
 }
        purple_signal_connect(purple_connections_get_handle(), "signed-on", &handle,
                                PURPLE_CALLBACK(signed_on), NULL);
 }

-
-void glib_main_loop() {
-       GMainLoop *loop = g_main_loop_new(NULL, 0);
-       g_main_loop_run(loop);
-}

diff --git a/c_purple.h b/c_purple.h
index 6acedd6..9c69c9c 100644 (file)
--- a/c_purple.h
+++ b/c_purple.h
@@ -22,5 +22,3 @@ guint glib_input_add(gint fd, PurpleInputCondition condition,
        PurpleInputFunction function, gpointer data);
 
 void connect_to_signals_for_demonstration_purposes_only(void);
        PurpleInputFunction function, gpointer data);
 
 void connect_to_signals_for_demonstration_purposes_only(void);

-
-void glib_main_loop(void);

diff --git a/nullclient.py b/nullclient.py
index 375625f..93fd270 100644 (file)
--- a/nullclient.py
+++ b/nullclient.py
@@ -1,4 +1,5 @@
 import purple
 import purple

+import ecore

 
 class NullClient:
     def __init__(self):
 
 class NullClient:
     def __init__(self):

@@ -29,4 +30,4 @@ if __name__ == '__main__':
     client.new_account("seu_email@email.com", client.protocol,"sua_senha_aqui")
 
     client.p.connect()
     client.new_account("seu_email@email.com", client.protocol,"sua_senha_aqui")
 
     client.p.connect()

-    client.p.run_loop()
+    ecore.main_loop_begin()

diff --git a/purple.pyx b/purple.pyx
index 181b9a3..f5b7aa1 100644 (file)
--- a/purple.pyx
+++ b/purple.pyx
@@ -239,9 +239,6 @@ cdef class Purple:
         conn = Connection()
         conn.connect()
 
         conn = Connection()
         conn.connect()
 

-    def run_loop(self):
-        glib_main_loop()
-

 include "core/account.pxd"
 include "core/buddy.pxd"
 include "glib.pxd"
 include "core/account.pxd"
 include "core/buddy.pxd"
 include "glib.pxd"