diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.c | 2 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.h | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2003-06-06 Marco Pesenti Gritti <marco@it.gnome.org> + + * configure.in: + + Update to 0.7.0 + + * lib/egg/egg-menu-merge.c: (egg_menu_merge_add_ui_from_string): + * lib/egg/egg-menu-merge.h: + + Fix crash on startup on alpha + 2003-06-06 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_clean), diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c index 71c7fb8e0..d2ddb0565 100644 --- a/lib/egg/egg-menu-merge.c +++ b/lib/egg/egg-menu-merge.c @@ -700,7 +700,7 @@ static GMarkupParser ui_parser = { guint egg_menu_merge_add_ui_from_string (EggMenuMerge *self, - const gchar *buffer, guint length, + const gchar *buffer, glong length, GError **error) { ParseContext ctx = { 0 }; diff --git a/lib/egg/egg-menu-merge.h b/lib/egg/egg-menu-merge.h index f4c440706..80a507964 100644 --- a/lib/egg/egg-menu-merge.h +++ b/lib/egg/egg-menu-merge.h @@ -86,7 +86,7 @@ GtkWidget *egg_menu_merge_get_widget (EggMenuMerge *self, * interface */ guint egg_menu_merge_add_ui_from_string (EggMenuMerge *self, const gchar *buffer, - guint length, + glong length, GError **error); guint egg_menu_merge_add_ui_from_file (EggMenuMerge *self, const gchar *filename, |