Author: rmottola
Date: Tue Feb 23 14:54:44 2016
New Revision: 39407
URL: http://svn.gna.org/viewcvs/gnustep?rev=39407&view=rev
Log:
Quit Recycler.app when activating desktop
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/GWorkspace/GWorkspace.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39407&r1=39406&r2=39407&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Tue Feb 23 14:54:44 2016
@@ -1,3 +1,8 @@
+2016-02-23 Riccardo Mottola <[email protected]>
+
+ * GWorkspace/GWorkspace.m
+ Quit Recycler.app when activating desktop.
+
2016-02-22 Riccardo Mottola <[email protected]>
* GWorkspace/GWorkspace.m
Modified: apps/gworkspace/trunk/GWorkspace/GWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/GWorkspace.m?rev=39407&r1=39406&r2=39407&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/GWorkspace.m (original)
+++ apps/gworkspace/trunk/GWorkspace/GWorkspace.m Tue Feb 23 14:54:44 2016
@@ -2276,11 +2276,20 @@
NSMenu *menu = [[[NSApp mainMenu] itemWithTitle: NSLocalizedString(@"Tools",
@"")] submenu];
id item;
- if ([dtopManager isActive] == NO) {
- [dtopManager activateDesktop];
- item = [menu itemWithTitle: NSLocalizedString(@"Show Desktop", @"")];
- [item setTitle: NSLocalizedString(@"Hide Desktop", @"")];
- } else {
+ if ([dtopManager isActive] == NO)
+ {
+ [dtopManager activateDesktop];
+ item = [menu itemWithTitle: NSLocalizedString(@"Show Desktop", @"")];
+ [item setTitle: NSLocalizedString(@"Hide Desktop", @"")];
+ if (recyclerApp)
+ {
+ recyclerCanQuit = YES;
+ [recyclerApp terminateApplication];
+ item = [menu itemWithTitle: NSLocalizedString(@"Hide Recycler", @"")];
+ [item setTitle: NSLocalizedString(@"Show Recycler", @"")];
+ }
+ }
+ else {
[dtopManager deactivateDesktop];
item = [menu itemWithTitle: NSLocalizedString(@"Hide Desktop", @"")];
[item setTitle: NSLocalizedString(@"Show Desktop", @"")];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
