diff options
| author | Hans Breuer <hans@breuer.org> | 2008-06-20 20:39:22 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2008-06-20 20:39:22 +0000 |
| commit | 8e2ef4982b50bebf9874504ce1782809c994aa91 (patch) | |
| tree | 275986d1f7db2bf0c73aef7b85d947a1664a849b | |
| parent | 2e75eb1330c144cfde8e81b9510953d2e5a76384 (diff) | |
| download | gtk+-8e2ef4982b50bebf9874504ce1782809c994aa91.tar.gz | |
must return a value of the appropriate type with g_return_val_if_fail
2008-06-20 Hans Breuer <hans@breuer.org>
* gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return
a value of the appropriate type with g_return_val_if_fail
* gdk/gdkconfig.h.win32 : add the GSEAL definition here as well
* gtk/gtkfilesystem.c : don't add the "File System" on win32
* tests/makefile.msc : remove broken autotestfile(system|chooser)
from build
svn path=/trunk/; revision=20657
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | gdk/gdkconfig.h.win32 | 8 | ||||
| -rw-r--r-- | gtk/gtkfilesystem.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmessagedialog.c | 2 | ||||
| -rw-r--r-- | gtk/gtkplug.c | 2 | ||||
| -rw-r--r-- | tests/makefile.msc | 8 |
7 files changed, 29 insertions, 7 deletions
@@ -1,3 +1,15 @@ +2008-06-20 Hans Breuer <hans@breuer.org> + + * gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return + a value of the appropriate type with g_return_val_if_fail + + * gdk/gdkconfig.h.win32 : add the GSEAL definition here as well + + * gtk/gtkfilesystem.c : don't add the "File System" on win32 + + * tests/makefile.msc : remove broken autotestfile(system|chooser) + from build + 2008-06-20 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkeditable.c: Document and use - instead of _ in signal names. diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32 index 1258a460dd..7bd668e81e 100644 --- a/gdk/gdkconfig.h.win32 +++ b/gdk/gdkconfig.h.win32 @@ -10,6 +10,14 @@ extern "C" { #endif /* __cplusplus */ +#ifndef GSEAL +/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */ +# ifdef GSEAL_ENABLE +# define GSEAL(ident) _g_sealed__ ## ident +# else +# define GSEAL(ident) ident +# endif +#endif /* !GSEAL */ #define GDK_WINDOWING_WIN32 diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 8ec0e67e28..d76808372b 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -555,8 +555,10 @@ _gtk_file_system_list_volumes (GtkFileSystem *file_system) list = g_slist_copy (priv->volumes); +#ifndef G_OS_WIN32 /* Prepend root volume */ list = g_slist_prepend (list, (gpointer) root_volume_token); +#endif return list; } diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 0696d21317..b55c482bb5 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1694,7 +1694,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item, G_CONST_RETURN gchar * gtk_menu_item_get_accel_path (GtkMenuItem *menu_item) { - g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); + g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL); return menu_item->accel_path; } diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 9e7c2f2780..75041f096f 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -654,7 +654,7 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog, GtkWidget * gtk_message_dialog_get_image (GtkMessageDialog *dialog) { - g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog)); + g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (dialog), NULL); return dialog->image; } diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 15238218fd..9202b476ed 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -276,7 +276,7 @@ gtk_plug_get_id (GtkPlug *plug) gboolean gtk_plug_get_embedded (GtkPlug *plug) { - g_return_val_if_fail (GTK_IS_PLUG (plug), NULL); + g_return_val_if_fail (GTK_IS_PLUG (plug), FALSE); return plug->socket_window != NULL; } diff --git a/tests/makefile.msc b/tests/makefile.msc index 6450286332..9018d05879 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -40,8 +40,8 @@ all : \ # Test programs: # TESTAPPS = \ - autotestfilechooser autotestfilesystem \ - buildertest floatingtest \ +# autotestfilechooser autotestfilesystem \ + buildertest floatingtest objecttests \ testaccel testactions testassistant \ testbbox \ testcairo testcalendar testcellrenderertext testcombo testcombochange \ @@ -101,8 +101,8 @@ EXTRA_OBJETCS = testsocket_common.obj EXTRA_OBJETCS = testsocket_common.obj !ENDIF -$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) - $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ +$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj + $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) $(TESTAPP).obj : $(TESTAPP).c |