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

Don't show this dialog more than once per collection.

Browse Source 
2002-06-04  Christopher James Lahey  <clahey@ximian.com>

	* menus/gal-view-menus.c (define_views): Don't show this dialog
	more than once per collection.

svn path=/trunk/; revision=17106
This commit is contained in:
Christopher James Lahey
2002-06-04 17:16:57 +00:00
committed by Chris Lahey
parent b7f26419b3
commit c1dadee81a
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
widgets/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-04 Christopher James Lahey <clahey@ximian.com>
* menus/gal-view-menus.c (define_views): Don't show this dialog
more than once per collection.
2002-05-14 Christopher James Lahey <clahey@ximian.com>
* menus/gal-view-menus.c (build_menus): Made it so that if the

41
widgets/menus/gal-view-menus.c
View File

@ -31,6 +31,7 @@ struct _GalViewMenusPrivate {
int instance_changed_id;
BonoboUIComponent *component;
EList *listenerClosures;
GtkWidget *define_views_dialog;
};
typedef struct {
@ -131,6 +132,13 @@ add_instance (GalViewMenus *gvm,
}
static void
clear_define_views_dialog (gpointer data)
{
GalViewMenus *gvm = GAL_VIEW_MENUS (data);
gvm->priv->define_views_dialog = NULL;
}
static void
gvm_destroy (GtkObject *object)
{
@ -140,6 +148,11 @@ gvm_destroy (GtkObject *object)
gal_view_menus_unmerge (gvm, NULL);
if (gvm->priv->define_views_dialog) {
gtk_object_weakunref (GTK_OBJECT (gvm->priv->define_views_dialog),
clear_define_views_dialog,
gvm);
}
g_free(gvm->priv);
gvm->priv = NULL;
@ -157,12 +170,13 @@ gvm_class_init (GtkObjectClass *klass)
static void
gvm_init (GalViewMenus *gvm)
{
gvm->priv = g_new(GalViewMenusPrivate, 1);
gvm->priv->instance = NULL;
gvm->priv = g_new(GalViewMenusPrivate, 1);
gvm->priv->instance = NULL;
gvm->priv->collection_changed_id = 0;
gvm->priv->instance_changed_id = 0;
gvm->priv->component = NULL;
gvm->priv->listenerClosures = NULL;
gvm->priv->instance_changed_id = 0;
gvm->priv->component = NULL;
gvm->priv->listenerClosures = NULL;
gvm->priv->define_views_dialog = NULL;
}
E_MAKE_TYPE(gal_view_menus, "GalViewMenus", GalViewMenus, gvm_class_init, gvm_init, PARENT_TYPE);
@ -209,10 +223,19 @@ define_views(BonoboUIComponent *component,
GalViewMenus *menus,
char *cname)
{
GtkWidget *dialog = gal_define_views_dialog_new(menus->priv->instance->collection);
gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
GTK_SIGNAL_FUNC(dialog_clicked), menus);
gtk_widget_show(dialog);
if (menus->priv->define_views_dialog) {
gdk_window_raise (menus->priv->define_views_dialog->window);
} else {
GtkWidget *dialog = gal_define_views_dialog_new(menus->priv->instance->collection);
gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
GTK_SIGNAL_FUNC(dialog_clicked), menus);
menus->priv->define_views_dialog = dialog;
gtk_object_weakref (GTK_OBJECT (dialog),
clear_define_views_dialog,
menus);
gtk_widget_show(dialog);
}
}
static void