matchbox-panel: add patch to allow vfolders to match against multiple categories

  - a vfolder .directory file can now contain something like
    Match=AudioVideo;Graphics;Media;Viewer;

diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch
new file mode 100644 (file)
index 0000000..3bd5d91
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch
@@ -0,0 +1,32 @@
+--- matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c     2005-04-06 22:13:00.000000000 +0200
++++ matchbox-panel-0.9.2.new/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100
+@@ -566,7 +566,28 @@
+                                   {
+                                     fallback = menu_lookup[i].item;
+                                   }
+-                                if (strstr(category, 
++                                if (strstr(menu_lookup[i].match_str, ";"))
++                                  {
++                                    char *s;
++                                    char *match_str = menu_lookup[i].match_str;
++                                    
++                                    while (s = strstr(match_str, ";"))
++                                      {
++                                        size_t len = s - match_str;
++                                        char *tok = (char *) malloc (sizeof (char) * (len + 1));
++
++                                        strncpy (tok, match_str, len);
++                                        tok[len] = 0;
++                                        match_str = s + 1;
++
++                                        if (strstr (category, tok))
++                                          {
++                                            m = menu_lookup[i].item;
++                                          }
++                                        free (tok);
++                                      }
++                                  }
++                                else if (strstr(category, 
+                                            menu_lookup[i].match_str))
+                                   {
+                                     m = menu_lookup[i].item;

diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 0e2ccf3..7ae8836 100644 (file)
--- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -1,11 +1,12 @@
 include matchbox-panel.inc
 
-PR="r10"
+PR="r11"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://add_hostap.patch;patch=1 \
            http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \
            http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1 \
            file://mb-applet-battery-repaint.patch;patch=1 \
+           file://mb-panel-multi-category-matching.patch;patch=1 \
           file://system-monitor-crash-fix.patch;patch=1 "