From 1f08efd25771856f49285ea26e8a5056ff86763f Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 14 Feb 2010 20:57:07 +0000 Subject: Remove workaround for wrong drag behaviour Revert "chat_window_create_label: ref the widgets stored as data so we are sure they stay alive when doing DnD" This is not needed anymore as we handle dragging correctly now This reverts commit 183fa2e8a94d94a7098120fc43cde9ad83869de6. --- src/empathy-chat-window.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 7531cb840..d8c68dc03 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -253,9 +253,9 @@ chat_window_create_label (EmpathyChatWindow *window, gtk_misc_set_padding (GTK_MISC (name_label), 2, 0); gtk_misc_set_alignment (GTK_MISC (name_label), 0.0, 0.5); - g_object_set_data_full (G_OBJECT (chat), + g_object_set_data (G_OBJECT (chat), is_tab_label ? "chat-window-tab-label" : "chat-window-menu-label", - g_object_ref (name_label), g_object_unref); + name_label); status_image = gtk_image_new (); @@ -265,12 +265,12 @@ chat_window_create_label (EmpathyChatWindow *window, gtk_box_pack_start (GTK_BOX (event_box_hbox), status_image, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (event_box_hbox), name_label, TRUE, TRUE, 0); - g_object_set_data_full (G_OBJECT (chat), + g_object_set_data (G_OBJECT (chat), is_tab_label ? "chat-window-tab-image" : "chat-window-menu-image", - g_object_ref (status_image), g_object_unref); - g_object_set_data_full (G_OBJECT (chat), + status_image); + g_object_set_data (G_OBJECT (chat), is_tab_label ? "chat-window-tab-tooltip-widget" : "chat-window-menu-tooltip-widget", - g_object_ref (event_box), g_object_unref); + event_box); gtk_container_add (GTK_CONTAINER (event_box), event_box_hbox); gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, TRUE, 0); @@ -278,8 +278,7 @@ chat_window_create_label (EmpathyChatWindow *window, if (is_tab_label) { close_button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); - g_object_set_data_full (G_OBJECT (chat), "chat-window-tab-close-button", - g_object_ref (close_button), g_object_unref); + g_object_set_data (G_OBJECT (chat), "chat-window-tab-close-button", close_button); /* We don't want focus/keynav for the button to avoid clutter, and * Ctrl-W works anyway. -- cgit v1.2.3