summaryrefslogtreecommitdiff
path: root/applets/wncklet/window-list.c
diff options
context:
space:
mode:
Diffstat (limited to 'applets/wncklet/window-list.c')
-rw-r--r--applets/wncklet/window-list.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 35bdbd45..da232447 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -63,6 +63,7 @@ static void call_system_monitor(GtkAction* action, TasklistData* tasklist);
static void display_properties_dialog(GtkAction* action, TasklistData* tasklist);
static void display_help_dialog(GtkAction* action, TasklistData* tasklist);
static void display_about_dialog(GtkAction* action, TasklistData* tasklist);
+static void destroy_tasklist(GtkWidget* widget, TasklistData* tasklist);
static void tasklist_update(TasklistData* tasklist)
{
@@ -147,16 +148,6 @@ static void applet_change_pixel_size(MatePanelApplet* applet, gint size, Tasklis
tasklist_update(tasklist);
}
-static void destroy_tasklist(GtkWidget* widget, TasklistData* tasklist)
-{
- g_object_unref(tasklist->settings);
-
- if (tasklist->properties_dialog)
- gtk_widget_destroy(tasklist->properties_dialog);
-
- g_free(tasklist);
-}
-
/* TODO: this is sad, should be used a function to retrieve applications from
* .desktop or some like that. */
static const char* system_monitors[] = {
@@ -694,3 +685,18 @@ static void display_properties_dialog(GtkAction* action, TasklistData* tasklist)
gtk_window_set_screen(GTK_WINDOW(tasklist->properties_dialog), gtk_widget_get_screen(tasklist->applet));
gtk_window_present(GTK_WINDOW(tasklist->properties_dialog));
}
+
+static void destroy_tasklist(GtkWidget* widget, TasklistData* tasklist)
+{
+ g_signal_handlers_disconnect_by_data (G_OBJECT (tasklist->applet), tasklist);
+
+ g_signal_handlers_disconnect_by_data (tasklist->settings, tasklist);
+
+ g_object_unref(tasklist->settings);
+
+ if (tasklist->properties_dialog)
+ gtk_widget_destroy(tasklist->properties_dialog);
+
+ g_free(tasklist);
+
+}