[evolution-patches] F/B Patch 2
- From: Gary Ekker <gekker novell com>
- To: evolution-patches lists ximian com, jpr ximian com
- Subject: [evolution-patches] F/B Patch 2
- Date: Wed, 14 Apr 2004 14:41:13 -0600
Here is the new patch that includes the removal of the calendar
publishing init stuff from createControls.
Cheers.
-Gary
? 56628.patch
? fb.patch
? fb2.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2248
diff -u -r1.2248 ChangeLog
--- ChangeLog 14 Apr 2004 15:56:48 -0000 1.2248
+++ ChangeLog 14 Apr 2004 20:12:43 -0000
@@ -1,3 +1,18 @@
+2004-04-14 Gary Ekker <gekker novell com>
+
+ * gui/calendar-component.h: move the calendar publishing initialization
+ from createControls to main.c
+
+ * gui/calendar-component.c: (create_controls): Ditto
+
+ * gui/main.c: (initialize): Ditto
+
+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-14 JP Rosevear <jpr ximian com>
Fixes #56553
Index: gui/calendar-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.c,v
retrieving revision 1.159
diff -u -r1.159 calendar-component.c
--- gui/calendar-component.c 14 Apr 2004 05:40:01 -0000 1.159
+++ gui/calendar-component.c 14 Apr 2004 20:12:43 -0000
@@ -573,24 +573,6 @@
return CORBA_TRUE;
}
-static void
-init_calendar_publishing (CalendarComponent *calendar_component)
-{
- guint idle_id = 0;
- CalendarComponentPrivate *priv;
-
- priv = calendar_component->priv;
-
- gconf_client_add_dir (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
- priv->gconf_notify_id
- = gconf_client_notify_add (priv->gconf_client, CALENDAR_CONFIG_PUBLISH,
- (GConfClientNotifyFunc) conf_changed_callback, NULL,
- NULL, NULL);
-
- idle_id = g_idle_add ((GSourceFunc) init_calendar_publishing_cb, GINT_TO_POINTER (idle_id));
-}
-
static gboolean
selector_tree_drag_drop (GtkWidget *widget,
GdkDragContext *context,
@@ -870,9 +852,6 @@
e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
gtk_widget_show (statusbar_widget);
statusbar_control = bonobo_control_new (statusbar_widget);
-
- /* Initialize Calendar Publishing */
- init_calendar_publishing (calendar_component);
/* connect after setting the initial selections, or we'll get unwanted calls
to calendar_control_sensitize_calendar_commands */
@@ -1211,5 +1190,25 @@
return component->priv->activity_handler;
}
+void
+calendar_component_init_publishing (void)
+{
+ guint idle_id = 0;
+ CalendarComponent *calendar_component;
+ CalendarComponentPrivate *priv;
+
+ calendar_component = calendar_component_peek ();
+
+ priv = calendar_component->priv;
+
+ gconf_client_add_dir (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+ priv->gconf_notify_id
+ = gconf_client_notify_add (priv->gconf_client, CALENDAR_CONFIG_PUBLISH,
+ (GConfClientNotifyFunc) conf_changed_callback, NULL,
+ NULL, NULL);
+
+ idle_id = g_idle_add ((GSourceFunc) init_calendar_publishing_cb, GINT_TO_POINTER (idle_id));
+}
BONOBO_TYPE_FUNC_FULL (CalendarComponent, GNOME_Evolution_Component, PARENT_TYPE, calendar_component)
Index: gui/calendar-component.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.h,v
retrieving revision 1.13
diff -u -r1.13 calendar-component.h
--- gui/calendar-component.h 24 Jan 2004 22:45:53 -0000 1.13
+++ gui/calendar-component.h 14 Apr 2004 20:12:43 -0000
@@ -66,5 +66,7 @@
ESourceSelector *calendar_component_peek_source_selector (CalendarComponent *component);
EActivityHandler *calendar_component_peek_activity_handler (CalendarComponent *component);
+void calendar_component_init_publishing (void);
+
#endif /* _CALENDAR_COMPONENT_H_ */
Index: gui/main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/main.c,v
retrieving revision 1.164
diff -u -r1.164 main.c
--- gui/main.c 4 Feb 2004 11:54:58 -0000 1.164
+++ gui/main.c 14 Apr 2004 20:12:43 -0000
@@ -140,6 +140,9 @@
#endif
launch_alarm_daemon ();
+
+ /* Initialize Calendar Publishing */
+ calendar_component_init_publishing ();
}
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 20:12:43 -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]