Merge lp://qastaging/~goehle/evolution-indicator/dont-quit-on-close into lp://qastaging/evolution-indicator
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~goehle/evolution-indicator/dont-quit-on-close |
Merge into: | lp://qastaging/evolution-indicator |
Diff against target: |
1131 lines (+975/-24) (has conflicts) 5 files modified
ChangeLog (+628/-0) autogen.sh (+0/-11) configure.ac (+6/-1) data/evolution-indicator.schemas.in (+33/-0) src/evolution-indicator.c (+308/-12) Text conflict in configure.ac Text conflict in src/evolution-indicator.c |
To merge this branch: | bzr merge lp://qastaging/~goehle/evolution-indicator/dont-quit-on-close |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Indicator Applet Developers | Pending | ||
Review via email: mp+42151@code.qastaging.launchpad.net |
Description of the change
A fix of the last merge, which was bungled.
I've included functionality which allows the indicator-applet to have evolution run in the background with no open windows.
Using g_signal when the last open shell window is closed the indicator applet hides the window instead of deleting it. This gives the impression that evolution is "running in the applet".
I also implemented the ability to turn this feature on and off and to run evolution on startup.
Unmerged revisions
- 76. By Geoff Goehle
-
Fixed unintended changes
- 75. By Geoff Goehle
-
Updated previous patch to work with new version of evolution indicator.
When the option is enabled the indicator will allow evolution to run
without a visible window. - 74. By Geoff Goehle
-
Fixed unintended changes and added a missing file
Still getting used to merging and bzr. Some of these changes are not intended.... The bulk should be there but lines 70-120, 190-162, 380-414, 488-565 should removed.