diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.c | 4 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.h | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2003-06-08 Jeremy Katz <katzj@redhat.com> + + * lib/egg/egg-menu-merge.h (egg_menu_merge_add_ui_from_string): + Update prototype. + + * lib/egg/egg-menu-merge.c (egg_menu_merge_add_ui_from_file): + size_t fixes for 64 bit platforms. + (egg_menu_merge_add_ui_from_string): Use size_t appropriately. + 2003-06-09 Marco Pesenti Gritti <marco@it.gnome.org> * data/epiphany.schemas.in: diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c index d2ddb0565..03f5686f0 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, glong length, + const gchar *buffer, size_t length, GError **error) { ParseContext ctx = { 0 }; @@ -742,7 +742,7 @@ egg_menu_merge_add_ui_from_file (EggMenuMerge *self, GError **error) { gchar *buffer; - gint length; + size_t length; guint res; if (!g_file_get_contents (filename, &buffer, &length, error)) diff --git a/lib/egg/egg-menu-merge.h b/lib/egg/egg-menu-merge.h index 80a507964..842663b58 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, - glong length, + size_t length, GError **error); guint egg_menu_merge_add_ui_from_file (EggMenuMerge *self, const gchar *filename, |