aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-01-11 23:13:47 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-01-11 23:13:47 +0800
commit0859d42faed775ce440ff18ed86e150b3f904424 (patch)
tree8153cbdbc1bb14851251709efe9b463fb6b741d3 /plugins
parent6e64a41decc7a94db55b41f4521f63d60d61c5db (diff)
downloadgsoc2013-evolution-0859d42faed775ce440ff18ed86e150b3f904424.tar.gz
gsoc2013-evolution-0859d42faed775ce440ff18ed86e150b3f904424.tar.zst
gsoc2013-evolution-0859d42faed775ce440ff18ed86e150b3f904424.zip
** Fix for bug #502303
2008-01-11 Milan Crha <mcrha@redhat.com> ** Fix for bug #502303 * plugin-manager.c: (eppm_response): Always destroy dialog and unset global variable. * plugin-manager.c: (org_gnome_plugin_manager_manage): Use G_TYPE_POINTER instead of GTK_TYPE_WIDGET in a list store to get rid of reference counting troubles on configuration widgets of plugins. Remember created dialog for future use. svn path=/trunk/; revision=34799
Diffstat (limited to 'plugins')
-rw-r--r--plugins/plugin-manager/ChangeLog11
-rw-r--r--plugins/plugin-manager/plugin-manager.c12
2 files changed, 17 insertions, 6 deletions
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index 2f09d9165e..868fe13f03 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-11 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #502303
+
+ * plugin-manager.c: (eppm_response):
+ Always destroy dialog and unset global variable.
+ * plugin-manager.c: (org_gnome_plugin_manager_manage):
+ Use G_TYPE_POINTER instead of GTK_TYPE_WIDGET in a list store
+ to get rid of reference counting troubles on configuration
+ widgets of plugins. Remember created dialog for future use.
+
2008-02-01 Andre Klapper <a9016009@gmx.de>
* plugin-manager.c: (org_gnome_plugin_manager_manage):
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index 733c776064..3fadd007dc 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -196,10 +196,8 @@ eppm_free (void *data)
static void
eppm_response (GtkDialog *w, int button, Manager *m)
{
- if (button == GTK_RESPONSE_CLOSE) {
- gtk_widget_destroy (GTK_WIDGET (w));
- dialog = NULL;
- }
+ gtk_widget_destroy (GTK_WIDGET (w));
+ dialog = NULL;
}
void
@@ -217,7 +215,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
GtkWidget *subvbox;
if (dialog) {
- gdk_window_raise (GTK_WIDGET (dialog)->window);
+ gtk_window_present (GTK_WINDOW (dialog));
return;
}
@@ -280,7 +278,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
gtk_widget_hide (def_configure_label);
gtk_box_pack_start (GTK_BOX (configure_page), def_configure_label, FALSE, FALSE, 6);
- store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER, GTK_TYPE_WIDGET);
+ store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
/* fill store */
m->plugins = e_plugin_list_plugins ();
@@ -396,6 +394,8 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
g_object_set_data_full (G_OBJECT (m->dialog), "plugin-manager", m, eppm_free);
g_signal_connect (m->dialog, "response", G_CALLBACK (eppm_response), m);
+ dialog = m->dialog;
+
gtk_widget_show (GTK_WIDGET (m->dialog));
}