diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-17 18:23:17 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-17 18:23:17 +0800 |
| commit | 8a4b2321006fd56b417e3c995c737dd7c0f364bd (patch) | |
| tree | 51296d33ea54750e15a2cc6c1a37eec525f5a86f /src/empathy-status-icon.c | |
| parent | 1ac788af54642510e3a091a42da692ad87ec8667 (diff) | |
| download | gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar.gz gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar.bz2 gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar.lz gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar.xz gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.tar.zst gsoc2013-empathy-8a4b2321006fd56b417e3c995c737dd7c0f364bd.zip | |
Do not autoconnect if networkmanager says we are not connected at startup.
svn path=/trunk/; revision=815
Diffstat (limited to 'src/empathy-status-icon.c')
| -rw-r--r-- | src/empathy-status-icon.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 7cd623b45..9ea0604fc 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -147,19 +147,6 @@ static void status_icon_event_free (StatusIconEvent *event G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT); static void -status_icon_notify_use_nm_cb (EmpathyConf *conf, - const gchar *key, - gpointer user_data) -{ - EmpathyStatusIconPriv *priv = GET_PRIV (user_data); - gboolean use_nm; - - if (empathy_conf_get_bool (conf, key, &use_nm)) { - empathy_idle_set_use_nm (priv->idle, use_nm); - } -} - -static void status_icon_notify_visibility_cb (EmpathyConf *conf, const gchar *key, gpointer user_data) @@ -187,7 +174,6 @@ empathy_status_icon_init (EmpathyStatusIcon *icon) { EmpathyStatusIconPriv *priv; GList *pendings, *l; - gboolean use_nm; priv = GET_PRIV (icon); @@ -205,17 +191,7 @@ empathy_status_icon_init (EmpathyStatusIcon *icon) MC_FILTER_PRIORITY_DIALOG, MC_FILTER_FLAG_INCOMING); - /* Setup EmpathyIdle */ priv->idle = empathy_idle_new (); - empathy_conf_get_bool (empathy_conf_get (), - EMPATHY_PREFS_USE_NM, - &use_nm); - empathy_conf_notify_add (empathy_conf_get (), - EMPATHY_PREFS_USE_NM, - status_icon_notify_use_nm_cb, - icon); - empathy_idle_set_auto_away (priv->idle, TRUE); - empathy_idle_set_use_nm (priv->idle, use_nm); /* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */ empathy_conf_notify_add (empathy_conf_get (), |