[evolution-patches] F/B Patch



This one fixes the crash bug and does not cause wonky UI behavior.
Hopefully I have it right this time.

-Gary
? 56628.patch
? fb.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2246
diff -u -r1.2246 ChangeLog
--- ChangeLog	13 Apr 2004 13:55:32 -0000	1.2246
+++ ChangeLog	14 Apr 2004 03:50:10 -0000
@@ -1,3 +1,9 @@
+2004-04-13  Gary Ekker  <gekker novell com>
+
+	* gui/dialogs/cal-prefs-dialog.c: (url_list_changed): remove a gfree
+	that was freeing a before it should have been. Also removed cruft from 
+	a previous attempt to fix the crash.
+
 2004-04-12  Gary Ekker  <gekker novell com>
 
         Fixes #56628
Index: gui/dialogs/cal-prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-prefs-dialog.c,v
retrieving revision 1.36
diff -u -r1.36 cal-prefs-dialog.c
--- gui/dialogs/cal-prefs-dialog.c	10 Apr 2004 21:31:37 -0000	1.36
+++ gui/dialogs/cal-prefs-dialog.c	14 Apr 2004 03:50:17 -0000
@@ -363,8 +363,6 @@
 		if ((xml = e_pub_uri_to_xml (url)))
 			url_list = g_slist_append (url_list, xml);
 		
-		g_free (url);
-		
 		valid = gtk_tree_model_iter_next ((GtkTreeModel *) model, &iter);
 	}
 	
@@ -586,12 +584,6 @@
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 	gtk_tree_view_set_headers_visible ((GtkTreeView *) dialog_data->url_list, TRUE);
 	
-	
-	g_signal_connect (gtk_tree_view_get_selection (dialog_data->url_list),
-			  "changed", 
-			  G_CALLBACK (cal_prefs_dialog_url_list_change), 
-			  dialog_data);
-	
 	g_signal_connect (dialog_data->url_list, "row-activated",
 			 G_CALLBACK (cal_prefs_dialog_url_list_double_click),
 			 dialog_data);
@@ -641,7 +633,6 @@
 					   -1);
 			
 			url_list_changed (dialog_data);
-			show_fb_config (dialog_data);
 			
 			if (!GTK_WIDGET_SENSITIVE ((GtkWidget *) dialog_data->url_remove)) {
 				selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
@@ -687,7 +678,6 @@
 					   -1);
 			
 			url_list_changed (dialog_data);
-			show_fb_config (dialog_data);
 			
 			if (!GTK_WIDGET_SENSITIVE ((GtkWidget *) dialog_data->url_remove)) {
 				selection = gtk_tree_view_get_selection ((GtkTreeView *) dialog_data->url_list);
@@ -760,7 +750,6 @@
 		}
 		g_free (url);
 		url_list_changed (dialog_data);
-		show_fb_config (dialog_data);
 	}
 }
 
@@ -789,7 +778,6 @@
 				      url->enabled ? _("Disable") : _("Enable"));
 		
 		url_list_changed (dialog_data);
-		show_fb_config (dialog_data);
 	}
 }
  
@@ -823,7 +811,6 @@
 					      url->enabled ? _("Disable") : _("Enable"));
 		
 		url_list_changed (dialog_data);
-		show_fb_config (dialog_data);
 	}
 
 	gtk_tree_path_free (path);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]