From 3f13ef20373997a8ceff443dae087b68353d9831 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 26 Jul 2008 06:45:43 +0000 Subject: [PATCH] 2008-07-26 [colin] 3.5.0cvs35 * src/gtk/menu.c * src/gtk/menu.h Fix prototype --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/menu.c | 2 +- src/gtk/menu.h | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 936138505..a60f2995b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-26 [colin] 3.5.0cvs35 + + * src/gtk/menu.c + * src/gtk/menu.h + Fix prototype + 2008-07-25 [colin] 3.5.0cvs34 * src/addrcustomattr.c diff --git a/PATCHSETS b/PATCHSETS index b611ec365..6ebb64392 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3446,3 +3446,4 @@ ( cvs diff -u -r 1.274.2.255 -r 1.274.2.256 src/mainwindow.c; cvs diff -u -r 1.83.2.135 -r 1.83.2.136 src/mimeview.c; cvs diff -u -r 1.395.2.374 -r 1.395.2.375 src/summaryview.c; cvs diff -u -r 1.68.2.47 -r 1.68.2.48 src/summaryview.h; ) > 3.5.0cvs32.patchset ( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/menu.h; ) > 3.5.0cvs33.patchset ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addrcustomattr.c; cvs diff -u -r 1.60.2.119 -r 1.60.2.120 src/addressbook.c; cvs diff -u -r 1.382.2.457 -r 1.382.2.458 src/compose.c; cvs diff -u -r 1.14.2.50 -r 1.14.2.51 src/editaddress.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/edittags.c; cvs diff -u -r 1.274.2.256 -r 1.274.2.257 src/mainwindow.c; cvs diff -u -r 1.83.2.136 -r 1.83.2.137 src/mimeview.c; cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/prefs_actions.c; cvs diff -u -r 1.59.2.70 -r 1.59.2.71 src/prefs_filtering.c; cvs diff -u -r 1.12.2.64 -r 1.12.2.65 src/prefs_template.c; cvs diff -u -r 1.395.2.375 -r 1.395.2.376 src/summaryview.c; cvs diff -u -r 1.96.2.202 -r 1.96.2.203 src/textview.c; cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/textview.h; cvs diff -u -r 1.43.2.102 -r 1.43.2.103 src/toolbar.c; cvs diff -u -r 1.4.2.64 -r 1.4.2.65 src/gtk/about.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/gtk/menu.c; cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/gtk/menu.h; cvs diff -u -r 1.14.2.64 -r 1.14.2.65 src/plugins/trayicon/trayicon.c; ) > 3.5.0cvs34.patchset +( cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/menu.c; cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/gtk/menu.h; ) > 3.5.0cvs35.patchset diff --git a/configure.ac b/configure.ac index b9f75a8e7..fa1e32cc2 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=34 +EXTRA_VERSION=35 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/menu.c b/src/gtk/menu.c index a3f33a095..b2c320d7f 100644 --- a/src/gtk/menu.c +++ b/src/gtk/menu.c @@ -84,7 +84,7 @@ GtkWidget *menu_create_items(GtkItemFactoryEntry *entries, return gtk_item_factory_get_widget(*factory, path); } -GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry **entries, +GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry *entries, gint num_entries, gpointer data) { GtkActionGroup *group = gtk_action_group_new(name); diff --git a/src/gtk/menu.h b/src/gtk/menu.h index 7fda1aa2d..8ae544f80 100644 --- a/src/gtk/menu.h +++ b/src/gtk/menu.h @@ -82,7 +82,7 @@ void menu_set_sensitive (GtkItemFactory *ifactory, const gchar *path, gboolean sensitive); -GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry **entries, +GtkActionGroup *cm_menu_create_action_group(const gchar *name, GtkActionEntry *entries, gint num_entries, gpointer data); void cm_menu_set_sensitive(gchar *menu, gboolean sensitive); void cm_toggle_menu_set_active(gchar *menu, gboolean active); -- 2.25.1