Commit b61156d4 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Remove the result file on error. (#79929, David Highley)

Tue May 14 18:41:58 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
        Remove the result file on error. (#79929, David
        Highley)

        * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
        If the menu is currently active, cancel it before
        setting the new menu. (#79162, Jonathan Blandford.)
parent 390ad328
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Tue May 14 18:13:10 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix
......
......@@ -295,7 +295,12 @@ gtk_option_menu_remove_menu (GtkOptionMenu *option_menu)
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
if (option_menu->menu)
gtk_menu_detach (GTK_MENU (option_menu->menu));
{
if (GTK_MENU_SHELL (option_menu->menu)->active)
g_signal_emit_by_name (option_menu->menu, "cancel", 0);
gtk_menu_detach (GTK_MENU (option_menu->menu));
}
}
void
......
......@@ -264,17 +264,23 @@ pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/g
endif
gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
$(pixbuf_csource) \
--raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h
$(pixbuf_csource) \
--raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
$(pixbuf_csource) \
--raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h || \
( rm -f $(srcdir)/gtkstockpixbufs.h && false )
EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment