aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-07 01:56:38 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-07 01:56:38 +0800
commitc77bc119424a6033d6f87a5e5d6b312009f8672f (patch)
treed3e8ff1224cfb66f339485430da280033ac62272
parent63d4e714682577a3bb854deeee33cc6008d5e65a (diff)
downloadgsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar.gz
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar.bz2
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar.lz
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar.xz
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.tar.zst
gsoc2013-epiphany-c77bc119424a6033d6f87a5e5d6b312009f8672f.zip
Update to 0.7.0
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
-rw-r--r--ChangeLog11
-rw-r--r--lib/egg/egg-menu-merge.c2
-rw-r--r--lib/egg/egg-menu-merge.h2
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 931521bce..845baad5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,