diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:52 +0800 |
| commit | bb1cf54832b5c3b29744407de9189cd63af9c3c2 (patch) | |
| tree | c6a9439cdabd11b577223f9f6ff5923e035a4a8c /src | |
| parent | b8e7e162b685196577a7fc7fd4b56c173e76c40e (diff) | |
| parent | 25a167b368cfa169810f4fc6c8d4b9c6adba8aef (diff) | |
| download | gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.gz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.bz2 gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.lz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.xz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.zst gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.zip | |
Merge branch 'gnome-3-4'
Conflicts:
po/ca@valencia.po
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-roster-window.c | 1 | ||||
| -rw-r--r-- | src/empathy.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 952073d25..a8eb40808 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -2642,6 +2642,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); diff --git a/src/empathy.c b/src/empathy.c index 2876edf84..4db2cbb62 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -367,13 +367,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 ( |