[Xfce4-commits] [apps/xfdashboard] 01/02: Fix year in copyright messages and remove support for environment variable XFDASHBOARD_FORCE_NEW_INSTANCE in XfdashboardApplication

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit a156305a746425012d28143d808efdf6d38c7a34
Author: Stephan Haller <nomad at froevel.de>
Date:   Thu Nov 12 21:36:59 2015 +0100

    Fix year in copyright messages and remove support for environment variable XFDASHBOARD_FORCE_NEW_INSTANCE in XfdashboardApplication
---
 plugins/clock-view/clock-view.c |    2 +-
 plugins/clock-view/clock-view.h |    2 +-
 plugins/clock-view/plugin.c     |    2 +-
 xfdashboard/application.c       |   19 +------------------
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/plugins/clock-view/clock-view.c b/plugins/clock-view/clock-view.c
index 4f1a5fc..d73ba29 100644
--- a/plugins/clock-view/clock-view.c
+++ b/plugins/clock-view/clock-view.c
@@ -1,7 +1,7 @@
 /*
  * clock-view: A view showing a clock
  * 
- * Copyright 2012-2014 Stephan Haller <nomad at froevel.de>
+ * Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/plugins/clock-view/clock-view.h b/plugins/clock-view/clock-view.h
index 0a3f1f2..dca1ff5 100644
--- a/plugins/clock-view/clock-view.h
+++ b/plugins/clock-view/clock-view.h
@@ -1,7 +1,7 @@
 /*
  * clock-view: A view showing a clock
  * 
- * Copyright 2012-2014 Stephan Haller <nomad at froevel.de>
+ * Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/plugins/clock-view/plugin.c b/plugins/clock-view/plugin.c
index e2a4720..75b39af 100644
--- a/plugins/clock-view/plugin.c
+++ b/plugins/clock-view/plugin.c
@@ -1,7 +1,7 @@
 /*
  * plugin: Plugin functions for 'clock-view'
  * 
- * Copyright 2012-2014 Stephan Haller <nomad at froevel.de>
+ * Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/xfdashboard/application.c b/xfdashboard/application.c
index 1fc3c8a..d48acb4 100644
--- a/xfdashboard/application.c
+++ b/xfdashboard/application.c
@@ -1011,25 +1011,8 @@ XfdashboardApplication* xfdashboard_application_get_default(void)
 {
 	if(G_UNLIKELY(application==NULL))
 	{
-		gchar			*appID;
-		const gchar		*forceNewInstance=NULL;
-
-#ifdef DEBUG
-		/* If a new instance of xfdashboard is forced, e.g. for debugging purposes,
-		 * then create a unique application ID.
-		 */
-		forceNewInstance=g_getenv("XFDASHBOARD_FORCE_NEW_INSTANCE");
-#endif
-
-		if(forceNewInstance)
-		{
-			appID=g_strdup_printf("%s-%u", XFDASHBOARD_APP_ID, getpid());
-			g_message("Forcing new application instance with ID '%s'", appID);
-		}
-			else appID=g_strdup(XFDASHBOARD_APP_ID);
-
 		application=g_object_new(XFDASHBOARD_TYPE_APPLICATION,
-									"application-id", appID,
+									"application-id", XFDASHBOARD_APP_ID,
 									"flags", G_APPLICATION_HANDLES_COMMAND_LINE,
 									NULL);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.