Re: GSEAL branch merge

[Hans Breuer <hans breuer org>]

Am 20.06.2008 14:44, Tim Janik schrieb:
> Hey All.
>
> As discussed during previous IRC meetings:
>   http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00194.html
> The GSEAL branch has been merged into upstream today.
With the patch attached (and some minor things already commited) it does 
compile again with msvc. The code where I'm not 100% sure is from the GSEAL 
branch and gives:

gtkmenu.c
gtkmenu.c(825) : error C4047: 'function' : 'int ' differs in levels of 
indirection from 'struct _GtkWidget *'
gtkmenu.c(825) : warning C4024: 'g_value_set_boolean' : different types for 
formal and actual parameter 2

Ok to commit?

Thanks,
	Hans



-------- Hans "at" Breuer "dot" Org -----------
Tell me what you need, and I'll tell you how to
get along without it.                -- Dilbert

Index: gtk/gtkmenu.c
===================================================================
--- gtk/gtkmenu.c	(revision 20656)
+++ gtk/gtkmenu.c	(working copy)
@@ -822,7 +822,7 @@
   switch (prop_id)
     {
     case PROP_ACTIVE:
-      g_value_set_boolean (value, gtk_menu_get_active (menu));
+      g_value_set_uint (value, g_list_index (GTK_MENU_SHELL (menu)->children, gtk_menu_get_active (menu)));
       break;
     case PROP_ACCEL_GROUP:
       g_value_set_object (value, gtk_menu_get_accel_group (menu));
@@ -1776,7 +1776,7 @@
 const gchar*
 gtk_menu_get_accel_path (GtkMenu     *menu)
 {
-  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
 
   return menu->accel_path;
 }
@@ -5060,7 +5060,7 @@
 gtk_menu_get_monitor (GtkMenu *menu)
 {
   GtkMenuPrivate *priv;
-  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_val_if_fail (GTK_IS_MENU (menu), -1);
 
   priv = gtk_menu_get_private (menu);