Fix problems when NM is not running. Fixes bug #460419.

2007-07-26 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy/empathy-idle.c: Fix problems when NM is not running. Fixes
	bug #460419.

	* doc/*: Updated documentation.

svn path=/trunk/; revision=195

diff --git a/ChangeLog b/ChangeLog
index fd230be5fb12e763550bc6f94c3372fb94d88cc7..2f9db21ffb0bc57261e0e7575702b8ebc256ca34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy/empathy-idle.c: Fix problems when NM is not running. Fixes
+       bug #460419.
+
+       * doc/*: Updated documentation.
+
 2007-07-25 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy/empathy-filter.c: Adding more debug output.

diff --git a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
index 3597a859d78c994109b3375217c2ba0135aa7cd8..c75c659c26bb476c6f7ad88fa719ee12f28fb7e5 100644 (file)
--- a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
+++ b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml
@@ -139,15 +139,6 @@ empathy-ui-utils
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_pixbuf_avatar_from_contact ##### -->
-<para>
-
-</para>
-
-@contact: 
-@Returns: 
-
-
 <!-- ##### FUNCTION empathy_pixbuf_avatar_from_contact_scaled ##### -->
 <para>
 

diff --git a/doc/libempathy/tmpl/empathy-tp-chat.sgml b/doc/libempathy/tmpl/empathy-tp-chat.sgml
index 3422be65312e659608b51282fe0ba468e8379933..279608bc475a0a37278a40725274491b0eee9a07 100644 (file)
--- a/doc/libempathy/tmpl/empathy-tp-chat.sgml
+++ b/doc/libempathy/tmpl/empathy-tp-chat.sgml
@@ -53,6 +53,15 @@ EmpathyTpChat
 @empathytpchat: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL EmpathyTpChat::send-error ##### -->
+<para>
+
+</para>
+
+@empathytpchat: the object which received the signal.
+@arg1: 
+@arg2: 
+
 <!-- ##### ARG EmpathyTpChat:account ##### -->
 <para>
 

diff --git a/doc/libempathy/tmpl/empathy-tp-group.sgml b/doc/libempathy/tmpl/empathy-tp-group.sgml
index 56fcca10f5657ee7e321246922c3f4c92c9eed85..988b5d8f6b54a6c79a2959f53a820ae926b9bbd7 100644 (file)
--- a/doc/libempathy/tmpl/empathy-tp-group.sgml
+++ b/doc/libempathy/tmpl/empathy-tp-group.sgml
@@ -88,8 +88,8 @@ EmpathyTpGroup
 
 </para>
 
+@account: 
 @tp_chan: 
-@tp_conn: 
 @Returns: 
 
 

diff --git a/doc/libempathy/tmpl/empathy-utils.sgml b/doc/libempathy/tmpl/empathy-utils.sgml
index 2e3927f7f588ec9b25a0b3726a93103134bce32d..51442af5134ccd6279af5aee14eb9795f0ad3dc4 100644 (file)
--- a/doc/libempathy/tmpl/empathy-utils.sgml
+++ b/doc/libempathy/tmpl/empathy-utils.sgml
@@ -195,13 +195,3 @@ empathy-utils
 @Returns: 
 
 
-<!-- ##### FUNCTION empathy_get_channel_id ##### -->
-<para>
-
-</para>
-
-@account: 
-@tp_chan: 
-@Returns: 
-
-

diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 923b499beefec1bd9c575cc77ea1767fa3ac1b5a..f3af7c4f9ff16bb8d8b4a0e7625254f84bc654d8 100644 (file)
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -192,10 +192,22 @@ empathy_idle_init (EmpathyIdle *idle)
                                   G_TYPE_INVALID,
                                   G_TYPE_UINT, &nm_status,
                                   G_TYPE_INVALID);
-               priv->nm_connected = (nm_status == NM_STATE_CONNECTED);
 
-               empathy_debug (DEBUG_DOMAIN, "NetworkManager connected: %s",
-                              priv->nm_connected ? "Yes" : "No");
+               if (error) {
+                       /* Can't get actual status, NM is not working. */
+                       empathy_debug (DEBUG_DOMAIN, 
+                                      "Couldn't get NM state: %s",
+                                      error->message);
+                       g_clear_error (&error);
+                       g_object_unref (priv->nm_proxy);
+                       priv->nm_proxy = NULL;
+                       priv->nm_connected = TRUE;
+               } else {
+                       priv->nm_connected = (nm_status == NM_STATE_CONNECTED);
+
+                       empathy_debug (DEBUG_DOMAIN, "NetworkManager connected: %s",
+                                      priv->nm_connected ? "Yes" : "No");
+               }
 
                if (!priv->nm_connected) {
                        priv->saved_state = priv->state;