aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml9
-rw-r--r--doc/libempathy/tmpl/empathy-tp-chat.sgml9
-rw-r--r--doc/libempathy/tmpl/empathy-tp-group.sgml2
-rw-r--r--doc/libempathy/tmpl/empathy-utils.sgml10
-rw-r--r--libempathy/empathy-idle.c18
6 files changed, 32 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index fd230be5f..2f9db21ff 100644
--- 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 3597a859d..c75c659c2 100644
--- 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 3422be653..279608bc4 100644
--- 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 56fcca10f..988b5d8f6 100644
--- 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 2e3927f7f..51442af51 100644
--- 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 923b499be..f3af7c4f9 100644
--- 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;