[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.7-14-g15ae70b

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.

The branch, next has been updated
       via  15ae70b159c9728b7a270bd68f4630808cc0f471 (commit)
      from  88393f4a6c335c2ec8e6ecd8c18d2e553bc3fb5f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/wmaker-crm.git/commit/15ae70b159c9728b7a270bd68f4630808cc0f471

commit 15ae70b159c9728b7a270bd68f4630808cc0f471
Author: Doug Torrance <[email protected]>
Date:   Thu Oct 1 21:51:16 2015 -0400

    wmaker: Print error dialog when attempting to delete an in-use workspace.

diff --git a/src/workspace.c b/src/workspace.c
index e3efcfd..23da1ef 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -50,6 +50,7 @@
 #include "xinerama.h"
 #include "event.h"
 #include "wsmap.h"
+#include "dialog.h"
 
 #define MC_NEW          0
 #define MC_DESTROY_LAST 1
@@ -142,8 +143,13 @@ Bool wWorkspaceDelete(WScreen * scr, int workspace)
 	/* verify if workspace is in use by some window */
 	tmp = scr->focused_window;
 	while (tmp) {
-		if (!IS_OMNIPRESENT(tmp) && tmp->frame->workspace == workspace)
+		if (!IS_OMNIPRESENT(tmp) && tmp->frame->workspace == workspace) {
+			char buf[256];
+			snprintf(buf, sizeof(buf), _("Workspace \"%s\" in use; cannot delete"),
+				 scr->workspaces[workspace]->name);
+			wMessageDialog(scr, _("Error"), buf, _("OK"), NULL, NULL);
 			return False;
+		}
 		tmp = tmp->prev;
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 src/workspace.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
-- 
wmaker-crm.git ("The Window Maker window manager")


-- 
To unsubscribe, send mail to [email protected].