callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget-factory: Avoid a crash on exit

Browse Source
This commit is contained in:
Matthias Clasen
2014-07-06 18:37:29 -04:00
parent 80bd35c268
commit 2a7bd3a2da
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
demos/widget-factory/widget-factory.c
View File

@ -1,5 +1,4 @@
/* widget-factory: a collection of widgets in a single page, for easy /* widget-factory: a collection of widgets, for easy theme testing
* theming
* *
* Copyright (C) 2011 Canonical Ltd * Copyright (C) 2011 Canonical Ltd
* *
@ -17,7 +16,6 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* *
* Authored by Andrea Cimitan <andrea.cimitan@canonical.com> * Authored by Andrea Cimitan <andrea.cimitan@canonical.com>
*
*/ */
#include "config.h" #include "config.h"
@ -317,6 +315,9 @@ page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
const gchar *name; const gchar *name;
GtkWidget *page; GtkWidget *page;
if (gtk_widget_in_destruction (stack))
return;
name = gtk_stack_get_visible_child_name (GTK_STACK (stack)); name = gtk_stack_get_visible_child_name (GTK_STACK (stack));
if (g_str_equal (name, "page3")) if (g_str_equal (name, "page3"))
{ {
@ -421,14 +422,12 @@ main (int argc, char *argv[])
static GActionEntry app_entries[] = { static GActionEntry app_entries[] = {
{ "about", activate_about, NULL, NULL, NULL }, { "about", activate_about, NULL, NULL, NULL },
{ "quit", activate_quit, NULL, NULL, NULL }, { "quit", activate_quit, NULL, NULL, NULL },
{ "main", NULL, "s", "'steak'", NULL }, { "main", NULL, "s", "'steak'", NULL },
{ "wine", NULL, NULL, "false", NULL }, { "wine", NULL, NULL, "false", NULL },
{ "beer", NULL, NULL, "false", NULL }, { "beer", NULL, NULL, "false", NULL },
{ "water", NULL, NULL, "true", NULL }, { "water", NULL, NULL, "true", NULL },
{ "dessert", NULL, "s", "'bars'", NULL }, { "dessert", NULL, "s", "'bars'", NULL },
{ "pay", NULL, "s", NULL, NULL } { "pay", NULL, "s", NULL, NULL }
}; };
gint status; gint status;