X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstartupnotify.c;fp=openbox%2Fstartupnotify.c;h=8bc38da2c7d59a8712bbfcb81e92f02dbe787641;hb=6a8a8531bad25c148b4c62263d16c0996a21ca6e;hp=66bce264c13a68db853e53cacfbbb2e022bdd46b;hpb=2c6240fd2f3e50fca76bb3f4df172eb745982b79;p=chaz%2Fopenbox

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 66bce264..8bc38da2 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -28,7 +28,7 @@
 void sn_startup(gboolean reconfig) {}
 void sn_shutdown(gboolean reconfig) {}
 gboolean sn_app_starting() { return FALSE; }
-Time sn_app_started(const gchar *id, const gchar *wmclass)
+Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
 {
     return CurrentTime;
 }
@@ -169,7 +169,7 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
         screen_set_root_cursor();
 }
 
-Time sn_app_started(const gchar *id, const gchar *wmclass)
+Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
 {
     GSList *it;
     Time t = CurrentTime;
@@ -193,13 +193,22 @@ Time sn_app_started(const gchar *id, const gchar *wmclass)
                 found = TRUE;
         } else {
             seqclass = sn_startup_sequence_get_wmclass(seq);
-            seqname = sn_startup_sequence_get_name(seq);
             seqbin = sn_startup_sequence_get_binary_name(seq);
 
-            if ((seqname && !g_ascii_strcasecmp(seqname, wmclass)) ||
+            /* seqclass = "a string to match against the "resource name" or
+               "resource class" hints.  These are WM_CLASS[0] and WM_CLASS[1]"
+               - from the startup-notification spec
+            */
+            if ((seqclass && !strcmp(seqclass, wmclass)) ||
+                (seqclass && !strcmp(seqclass, name)) ||
+                /* Check the binary name against the class and name hints
+                   as well, to help apps that don't have the class set
+                   correctly */
                 (seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) ||
-                (seqclass && !strcmp(seqclass, wmclass)))
+                (seqbin && !g_ascii_strcasecmp(seqbin, name)))
+            {
                 found = TRUE;
+            }
         }
 
         if (found) {