gnome-session r5148 - in trunk: . gnome-session

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Nov 10 19:00:56 2008
New Revision: 5148
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5148&view=rev

Log:
Rewrite the app finding code to make more sense


Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-manager.c

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Mon Nov 10 19:00:56 2008
@@ -2412,13 +2412,10 @@
 
         g_debug ("GsmManager: Adding new client %s to session", new_startup_id);
 
-        if (IS_STRING_EMPTY (startup_id) && IS_STRING_EMPTY (app_id)) {
-                /* just accept the client - we can't associate with an
-                   existing App */
-                app = NULL;
-        } else if (IS_STRING_EMPTY (app_id)) {
+        if (app == NULL && !IS_STRING_EMPTY (startup_id)) {
                 app = find_app_for_startup_id (manager, startup_id);
-        } else if (IS_STRING_EMPTY (startup_id)) {
+        }
+        if (app == NULL && !IS_STRING_EMPTY (app_id)) {
                 /* try to associate this app id with a known app */
                 app = find_app_for_app_id (manager, app_id);
         }