[empathy] Make it a bit less obvious that telepathy presence is broken
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Make it a bit less obvious that telepathy presence is broken
- Date: Thu, 17 Aug 2017 00:23:40 +0000 (UTC)
commit 01a83d253e737c3677f7090a1aeb8d79e59bdc70
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Wed Aug 16 19:21:54 2017 -0500
Make it a bit less obvious that telepathy presence is broken
Apparently this is *not* a regression from 3.12, but Empathy says you
are offline if you have no contacts (e.g. only IRC accounts, which can't
have contacts). Make this less-obviously broken by hiding the relevant
widgets.
src/empathy-roster-window.c | 23 ++++++++++++-----------
src/empathy-roster-window.ui | 4 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 9261c50..d8e916f 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -116,7 +116,7 @@ struct _EmpathyRosterWindowPriv {
GtkWidget *notebook;
GtkWidget *no_entry_label;
GtkWidget *button_account_settings;
- GtkWidget *button_online;
+ //GtkWidget *button_online;
GtkWidget *button_show_offline;
GtkWidget *button_add_contact;
GtkWidget *spinner_loading;
@@ -387,7 +387,7 @@ button_account_settings_clicked_cb (GtkButton *button,
empathy_accounts_dialog_show_application (gdk_screen_get_default (),
NULL, FALSE, FALSE);
}
-
+/*
static void
button_online_clicked_cb (GtkButton *button,
EmpathyRosterWindow *self)
@@ -400,7 +400,7 @@ button_online_clicked_cb (GtkButton *button,
TP_CONNECTION_PRESENCE_TYPE_AVAILABLE);
g_object_unref (mgr);
-}
+}*/
static void
button_show_offline_clicked_cb (GtkButton *button,
@@ -478,8 +478,8 @@ display_page_message (EmpathyRosterWindow *self,
(flags & PAGE_MESSAGE_FLAG_ACCOUNTS) != 0);
gtk_widget_set_visible (self->priv->spinner_loading,
(flags & PAGE_MESSAGE_FLAG_SPINNER) != 0);
- gtk_widget_set_visible (self->priv->button_online,
- (flags & PAGE_MESSAGE_FLAG_ONLINE) != 0);
+// gtk_widget_set_visible (self->priv->button_online,
+// (flags & PAGE_MESSAGE_FLAG_ONLINE) != 0);
gtk_widget_set_visible (self->priv->button_show_offline,
(flags & PAGE_MESSAGE_FLAG_SHOW_OFFLINE) != 0);
gtk_widget_set_visible (self->priv->button_add_contact,
@@ -1735,9 +1735,10 @@ set_notebook_page (EmpathyRosterWindow *self)
if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
{
- display_page_message (self,
- _("Change your presence to see contacts here"),
- PAGE_MESSAGE_FLAG_ONLINE);
+// This message shows up always. WTF telepathy?
+// display_page_message (self,
+// _("Change your presence to see contacts here"),
+// PAGE_MESSAGE_FLAG_ONLINE);
goto out;
}
@@ -2348,7 +2349,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
"no_entry_label", &self->priv->no_entry_label,
"roster_scrolledwindow", &sw,
"button_account_settings", &self->priv->button_account_settings,
- "button_online", &self->priv->button_online,
+// "button_online", &self->priv->button_online,
"button_show_offline", &self->priv->button_show_offline,
"button_add_contact", &self->priv->button_add_contact,
"spinner_loading", &self->priv->spinner_loading,
@@ -2529,8 +2530,8 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
g_signal_connect (self->priv->button_account_settings, "clicked",
G_CALLBACK (button_account_settings_clicked_cb), self);
- g_signal_connect (self->priv->button_online, "clicked",
- G_CALLBACK (button_online_clicked_cb), self);
+// g_signal_connect (self->priv->button_online, "clicked",
+// G_CALLBACK (button_online_clicked_cb), self);
g_signal_connect (self->priv->button_show_offline, "clicked",
G_CALLBACK (button_show_offline_clicked_cb), self);
g_signal_connect (self->priv->button_add_contact, "clicked",
diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui
index 55588f3..3881a24 100644
--- a/src/empathy-roster-window.ui
+++ b/src/empathy-roster-window.ui
@@ -162,7 +162,7 @@
<property name="position">2</property>
</packing>
</child>
- <child>
+<!-- <child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -190,7 +190,7 @@
<property name="fill">True</property>
<property name="position">2</property>
</packing>
- </child>
+ </child> -->
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]