From 85e3defb0a9c38bf0689254d8c2240eeb5733659 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 5 Apr 2012 15:58:46 +0200 Subject: roster-window: Bring back log entry in individual context menu Looks like it has been accidentally removed. --- src/empathy-roster-window.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index e2ba06eaf..203a5aede 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -2643,6 +2643,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) EMPATHY_INDIVIDUAL_FEATURE_CALL | EMPATHY_INDIVIDUAL_FEATURE_EDIT | EMPATHY_INDIVIDUAL_FEATURE_INFO | + EMPATHY_INDIVIDUAL_FEATURE_LOG | EMPATHY_INDIVIDUAL_FEATURE_SMS | EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE); -- cgit v1.2.3 From 25a167b368cfa169810f4fc6c8d4b9c6adba8aef Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 11 Apr 2012 11:01:11 +0200 Subject: Don't display anything when being re-invoked in hidden mode Hidden is disabled by default, so if Empathy is re-invoked with --hidden explicitely passed, we shouldn't bring back the contact list or any UI. https://bugzilla.gnome.org/show_bug.cgi?id=673691 --- src/empathy.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src') diff --git a/src/empathy.c b/src/empathy.c index ac84d3317..b06b595e6 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -370,13 +370,6 @@ empathy_app_command_line (GApplication *app, self->notifications_approver = empathy_notifications_approver_dup_singleton (); } - else - { - /* We're requested to show stuff again, disable the start hidden global in - * case the accounts wizard wants to pop up. - */ - self->start_hidden = FALSE; - } if (self->show_preferences) empathy_roster_window_show_preferences ( -- cgit v1.2.3