- Update to 0.5

  Dang this was silly, I was working with old local copy, 0.2 in fact...
  No idea if I merged conflicts correctly.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2642 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 18 insertions, 0 deletions

diff --git a/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
new file mode 100644
index 000000000..3d8ff6e7f
--- /dev/null
+++ b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- src/libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ src/libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);