matchbox2: Make it working:

* fixed known crashers
* created usable icon theme
* provided session script

4 files changed, 144 insertions, 0 deletions

diff --git a/recipes/matchbox2/matchbox-panel-2/scaling-image-double-free.patch b/recipes/matchbox2/matchbox-panel-2/scaling-image-double-free.patch
new file mode 100644
index 0000000000..ab1fca10b9
--- /dev/null
+++ b/recipes/matchbox2/matchbox-panel-2/scaling-image-double-free.patch
@@ -0,0 +1,14 @@
+http://bugzilla.openedhand.com/show_bug.cgi?id=1794
+Index: matchbox-panel/mb-panel-scaling-image.c
+===================================================================
+--- matchbox-panel/mb-panel-scaling-image.c	(revision 2098)
++++ matchbox-panel/mb-panel-scaling-image.c	(working copy)
+@@ -284,7 +285,7 @@
+ 
+                 if (image->priv->caching) {
+                         g_hash_table_insert (image->priv->cache,
+-                                             image->priv->icon,
++                                             g_strdup(image->priv->icon),
+                                              pixbuf);
+                 } else
+                         g_object_unref (pixbuf);
diff --git a/recipes/matchbox2/matchbox-panel-2/startup-invalid-access.patch b/recipes/matchbox2/matchbox-panel-2/startup-invalid-access.patch
new file mode 100644
index 0000000000..66fac2a710
--- /dev/null
+++ b/recipes/matchbox2/matchbox-panel-2/startup-invalid-access.patch
@@ -0,0 +1,25 @@
+http://bugzilla.openedhand.com/show_bug.cgi?id=1791
+Index: applets/startup/startup.c
+===================================================================
+--- applets/startup/startup.c	(revision 2098)
++++ applets/startup/startup.c	(working copy)
+@@ -170,16 +170,17 @@
+ 
+         /* handle launchee timeouts */
+         while (tmp != NULL) {
++                GList *tmp_next = tmp->next;
+                 LaunchItem *item = (LaunchItem *) tmp->data;
+                 if ((item->when - t) <= 0) {
+-                        applet->launch_list = g_list_remove (tmp, item);
++                        applet->launch_list = g_list_delete_link (applet->launch_list, tmp);
+                         g_source_remove (item->timeout_id);
+                         free (item->id);
+                         free (item);
+ 
+                         break;
+                 }
+-                tmp = tmp->next;
++                tmp = tmp_next;
+         }
+ 
+         if (applet->launch_list == NULL && applet->hourglass_shown) {
diff --git a/recipes/matchbox2/matchbox-panel-2/startup-shown-uninitialized.patch b/recipes/matchbox2/matchbox-panel-2/startup-shown-uninitialized.patch
new file mode 100644
index 0000000000..2ee3efd01e
--- /dev/null
+++ b/recipes/matchbox2/matchbox-panel-2/startup-shown-uninitialized.patch
@@ -0,0 +1,13 @@
+http://bugzilla.openedhand.com/show_bug.cgi?id=1805
+Index: applets/startup/startup.c
+===================================================================
+--- applets/startup/startup.c	(revision 2098)
++++ applets/startup/startup.c	(working copy)
+@@ -228,6 +228,7 @@
+         applet = g_slice_new (StartupApplet);
+ 
+         applet->launch_list = NULL;
++        applet->hourglass_shown = FALSE;
+ 
+         /* Create image */
+         applet->image = MB_PANEL_SCALING_IMAGE
diff --git a/recipes/matchbox2/matchbox-panel-2/themeable-icons.patch b/recipes/matchbox2/matchbox-panel-2/themeable-icons.patch
new file mode 100644
index 0000000000..9b41ce81ed
--- /dev/null
+++ b/recipes/matchbox2/matchbox-panel-2/themeable-icons.patch
@@ -0,0 +1,92 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 2098)
++++ configure.ac	(working copy)
+@@ -88,14 +88,12 @@
+ applets/launcher/Makefile
+ applets/notify/Makefile
+ applets/startup/Makefile
+-applets/startup/data/Makefile
+ applets/startup-notify/Makefile
+ applets/systray/Makefile
+ applets/showdesktop/Makefile
+ applets/windowselector/Makefile
+ applets/battery/Makefile
+ applets/brightness/Makefile
+-applets/brightness/data/Makefile
+ po/Makefile.in
+ po/Makefile
+ ])
+Index: applets/startup/startup.c
+===================================================================
+--- applets/startup/startup.c	(revision 2098)
++++ applets/startup/startup.c	(working copy)
+@@ -191,8 +191,8 @@
+         if (applet->hourglass_cur_frame_n == 8)
+                 applet->hourglass_cur_frame_n = 0;
+ 
+-        icon = malloc (sizeof(DATADIR) + 16);
+-        sprintf (icon, "%s/hourglass-%i.png", DATADIR,
++        icon = malloc (12);
++        sprintf (icon, "hourglass-%i",
+                  applet->hourglass_cur_frame_n);
+ 
+         mb_panel_scaling_image_set_icon (applet->image, icon);
+Index: applets/startup/Makefile.am
+===================================================================
+--- applets/startup/Makefile.am	(revision 2098)
++++ applets/startup/Makefile.am	(working copy)
+@@ -1,5 +1,3 @@
+-SUBDIRS = data
+-
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+             -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ 	    -DDATADIR=\"$(pkgdatadir)/startup/\"
+Index: applets/brightness/Makefile.am
+===================================================================
+--- applets/brightness/Makefile.am	(revision 2098)
++++ applets/brightness/Makefile.am	(working copy)
+@@ -1,5 +1,3 @@
+-SUBDIRS = data
+-
+ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" \
+             -DGETTEXT_PACKAGE=\"matchbox-panel\" \
+ 	    -DDATADIR=\"$(pkgdatadir)/brightness/\"
+Index: applets/brightness/brightness.c
+===================================================================
+--- applets/brightness/brightness.c	(revision 2098)
++++ applets/brightness/brightness.c	(working copy)
+@@ -131,7 +131,6 @@
+             NULL};
+             
+         theme = gtk_icon_theme_get_default();
+-        gtk_icon_theme_append_search_path(theme, DATADIR);
+             
+         applet = g_slice_new(BrightnessApplet);
+         scale = gtk_scale_button_new(GTK_ICON_SIZE_BUTTON,
+Index: applets/windowselector/windowselector.c
+===================================================================
+--- applets/windowselector/windowselector.c	(revision 2098)
++++ applets/windowselector/windowselector.c	(working copy)
+@@ -797,7 +797,7 @@
+         switch (applet->mode) {
+         case MODE_STATIC_ICON:
+                 applet->image = mb_panel_scaling_image_new (orientation,
+-                        "panel-task-switcher");
++                        "task-switcher");
+                 gtk_container_add (GTK_CONTAINER (applet->button),
+                                 applet->image);
+                 break;
+Index: applets/showdesktop/showdesktop.c
+===================================================================
+--- applets/showdesktop/showdesktop.c	(revision 2098)
++++ applets/showdesktop/showdesktop.c	(working copy)
+@@ -50,7 +50,7 @@
+ 
+         /* TODO: remove this function and instead use a toggle button? */
+         
+-        icon = "panel-user-desktop";
++        icon = "user-desktop";
+ 
+         mb_panel_scaling_image_set_icon (applet->image, icon);
+ }