diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/menus/gal-view-new-dialog.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/menus/gal-view-new-dialog.c')
| -rw-r--r-- | widgets/menus/gal-view-new-dialog.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 41b4ea4c69..6c858d141b 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -23,7 +23,7 @@ #include <config.h> #include <libgnomeui/gnome-dialog.h> -#include <libgnomeui/gnome-stock.h> +#include <gtk/gtk.h> #include "gal-view-new-dialog.h" #include "gal-define-views-model.h" #include <gal/widgets/e-unicode.h> @@ -94,7 +94,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog) GladeXML *gui; GtkWidget *widget; - gui = glade_xml_new_with_domain (GAL_GLADEDIR "/gal-view-new-dialog.glade", NULL, PACKAGE); + gui = glade_xml_new (GAL_GLADEDIR "/gal-view-new-dialog.glade", NULL, PACKAGE); dialog->gui = gui; widget = glade_xml_get_widget(gui, "table-top"); @@ -107,8 +107,8 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog) gtk_widget_unref(widget); gnome_dialog_append_buttons(GNOME_DIALOG(dialog), - GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, + GTK_STOCK_OK, + GTK_STOCK_CANCEL, NULL); gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE); @@ -122,7 +122,9 @@ gal_view_new_dialog_destroy (GtkObject *object) { GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object); - gtk_object_unref(GTK_OBJECT(gal_view_new_dialog->gui)); + if (gal_view_new_dialog->gui) + gtk_object_unref(GTK_OBJECT(gal_view_new_dialog->gui)); + gal_view_new_dialog->gui = NULL; if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); |