evolution r35044 - in trunk: addressbook addressbook/gui/component calendar calendar/gui calendar/gui/dialogs composer e-util mail plugins/external-editor plugins/groupwise-features plugins/itip-formatter widgets/misc
- From: mcrha svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35044 - in trunk: addressbook addressbook/gui/component calendar calendar/gui calendar/gui/dialogs composer e-util mail plugins/external-editor plugins/groupwise-features plugins/itip-formatter widgets/misc
- Date: Mon, 18 Feb 2008 11:10:11 +0000 (GMT)
Author: mcrha
Date: Mon Feb 18 11:10:10 2008
New Revision: 35044
URL: http://svn.gnome.org/viewvc/evolution?rev=35044&view=rev
Log:
2008-02-18 Milan Crha <mcrha redhat com>
** Part of fix for bug #515744
* addressbook/gui/component/addressbook-migrate.c: (get_source_name):
* plugins/groupwise-features/send-options.c: (get_source):
* plugins/groupwise-features/share-folder-common.c: (get_container_id):
* plugins/groupwise-features/install-shared.c: (install_folder_response):
* plugins/external-editor/external-editor.c: (convert_to_camel_internet_address),
(org_gnome_external_editor):
* plugins/itip-formatter/itip-formatter.c: (idle_open_cb):
* mail/em-folder-view.c: (emfv_setup_view_instance):
* mail/mail-component.c: (impl_finalize):
* mail/message-list.c: (ml_tree_value_at):
* composer/e-msg-composer.c: (drop_action):
* e-util/e-config.c: (ep_finalise): Use proper member to free.
* widgets/misc/e-cursors.c: (e_cursors_init):
* widgets/misc/e-calendar-item.c: (e_calendar_item_draw_month):
* calendar/gui/dialogs/comp-editor.c: (drop_action):
* calendar/gui/calendar-config.c:
(calendar_config_get_hide_completed_tasks_sexp):
* calendar/gui/comp-editor-factory.c: (edit_existing):
* calendar/gui/e-day-view.c: (e_day_view_reshape_long_event),
(e_day_view_on_top_canvas_drag_data_received):
* calendar/gui/e-day-view-main-item.c:
(e_day_view_main_item_draw_events_in_vbars),
(e_day_view_main_item_draw_long_events_in_vbars):
* calendar/gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
* calendar/gui/e-cal-model.c: (redo_queries):
* calendar/gui/e-calendar-table.c: (e_calendar_table_open_task):
* calendar/gui/e-memo-table.c: (open_memo):
* calendar/gui/print.c: (print_todo_details):
* calendar/gui/migration.c: (get_source_name):
Memory leak fix.
* calendar/gui/e-week-view.c: (e_week_view_reshape_events): Simplifies things.
Modified:
trunk/addressbook/ChangeLog
trunk/addressbook/gui/component/addressbook-migrate.c
trunk/calendar/ChangeLog
trunk/calendar/gui/calendar-config.c
trunk/calendar/gui/comp-editor-factory.c
trunk/calendar/gui/dialogs/comp-editor.c
trunk/calendar/gui/e-cal-model.c
trunk/calendar/gui/e-calendar-table.c
trunk/calendar/gui/e-day-view-main-item.c
trunk/calendar/gui/e-day-view-top-item.c
trunk/calendar/gui/e-day-view.c
trunk/calendar/gui/e-memo-table.c
trunk/calendar/gui/e-week-view.c
trunk/calendar/gui/migration.c
trunk/calendar/gui/print.c
trunk/composer/ChangeLog
trunk/composer/e-msg-composer.c
trunk/e-util/ChangeLog
trunk/e-util/e-config.c
trunk/mail/ChangeLog
trunk/mail/em-folder-view.c
trunk/mail/mail-component.c
trunk/mail/message-list.c
trunk/plugins/external-editor/ChangeLog
trunk/plugins/external-editor/external-editor.c
trunk/plugins/groupwise-features/ChangeLog
trunk/plugins/groupwise-features/install-shared.c
trunk/plugins/groupwise-features/send-options.c
trunk/plugins/groupwise-features/share-folder-common.c
trunk/plugins/itip-formatter/ChangeLog
trunk/plugins/itip-formatter/itip-formatter.c
trunk/widgets/misc/ChangeLog
trunk/widgets/misc/e-calendar-item.c
trunk/widgets/misc/e-cursors.c
Modified: trunk/addressbook/gui/component/addressbook-migrate.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-migrate.c (original)
+++ trunk/addressbook/gui/component/addressbook-migrate.c Mon Feb 18 11:10:10 2008
@@ -216,6 +216,8 @@
} while (conflict);
+ g_strfreev (p);
+
return g_string_free (s, FALSE);
}
Modified: trunk/calendar/gui/calendar-config.c
==============================================================================
--- trunk/calendar/gui/calendar-config.c (original)
+++ trunk/calendar/gui/calendar-config.c Mon Feb 18 11:10:10 2008
@@ -1572,6 +1572,7 @@
sexp = g_strdup_printf ("(not (completed-before? (make-time \"%s\")))", isodate);
else
sexp = g_strdup_printf ("(completed-before? (make-time \"%s\"))", isodate);
+ g_free (isodate);
}
}
Modified: trunk/calendar/gui/comp-editor-factory.c
==============================================================================
--- trunk/calendar/gui/comp-editor-factory.c (original)
+++ trunk/calendar/gui/comp-editor-factory.c Mon Feb 18 11:10:10 2008
@@ -281,6 +281,7 @@
/* Set the object on the editor */
comp_editor_edit_comp (editor, comp);
comp_editor_focus (editor);
+ g_object_unref (comp);
oc->editor_count++;
g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc);
Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor.c Mon Feb 18 11:10:10 2008
@@ -310,7 +310,7 @@
}
}
- g_free (urls);
+ g_strfreev (urls);
success = TRUE;
break;
case DND_TYPE_TEXT_VCARD:
Modified: trunk/calendar/gui/e-cal-model.c
==============================================================================
--- trunk/calendar/gui/e-cal-model.c (original)
+++ trunk/calendar/gui/e-cal-model.c Mon Feb 18 11:10:10 2008
@@ -1748,7 +1748,6 @@
redo_queries (ECalModel *model)
{
ECalModelPrivate *priv;
- char *iso_start, *iso_end;
GList *l;
int len;
@@ -1758,6 +1757,8 @@
g_free (priv->full_sexp);
if (priv->start != -1 && priv->end != -1) {
+ char *iso_start, *iso_end;
+
iso_start = isodate_from_time_t (priv->start);
iso_end = isodate_from_time_t (priv->end);
@@ -1766,6 +1767,8 @@
" %s)",
iso_start, iso_end,
priv->search_sexp ? priv->search_sexp : "");
+ g_free (iso_start);
+ g_free (iso_end);
} else if (priv->search_sexp) {
priv->full_sexp = g_strdup (priv->search_sexp);
} else {
Modified: trunk/calendar/gui/e-calendar-table.c
==============================================================================
--- trunk/calendar/gui/e-calendar-table.c (original)
+++ trunk/calendar/gui/e-calendar-table.c Mon Feb 18 11:10:10 2008
@@ -1075,6 +1075,7 @@
tedit = COMP_EDITOR (task_editor_new (client, flags));
comp_editor_edit_comp (tedit, comp);
+ g_object_unref (comp);
if (flags & COMP_EDITOR_IS_ASSIGNED)
task_editor_show_assignment (TASK_EDITOR (tedit));
Modified: trunk/calendar/gui/e-day-view-main-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-main-item.c (original)
+++ trunk/calendar/gui/e-day-view-main-item.c Mon Feb 18 11:10:10 2008
@@ -373,21 +373,27 @@
/* If the event is TRANSPARENT, skip it. */
e_cal_component_get_transparency (comp, &transparency);
- if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
+ if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
+ g_object_unref (comp);
continue;
+ }
/* We can skip the events in the first column since they will
draw over this anyway. */
- if (event->num_columns > 0 && event->start_row_or_col == 0)
+ if (event->num_columns > 0 && event->start_row_or_col == 0) {
+ g_object_unref (comp);
continue;
+ }
bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
bar_y -= y;
/* Skip it if it isn't visible. */
- if (bar_y >= height || bar_y + bar_h <= 0)
+ if (bar_y >= height || bar_y + bar_h <= 0) {
+ g_object_unref (comp);
continue;
+ }
gdk_draw_rectangle (drawable, gc, TRUE,
grid_x, bar_y,
@@ -427,14 +433,18 @@
/* If the event is TRANSPARENT, skip it. */
e_cal_component_get_transparency (comp, &transparency);
- if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
+ if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
+ g_object_unref (comp);
continue;
+ }
if (!e_day_view_find_long_event_days (event,
day_view->days_shown,
day_view->day_starts,
- &start_day, &end_day))
+ &start_day, &end_day)) {
+ g_object_unref (comp);
continue;
+ }
for (day = start_day; day <= end_day; day++) {
grid_x = day_view->day_offsets[day] + 1 - x;
@@ -1099,21 +1109,27 @@
/* If the event is TRANSPARENT, skip it. */
e_cal_component_get_transparency (comp, &transparency);
- if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
+ if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
+ g_object_unref (comp);
continue;
+ }
/* We can skip the events in the first column since they will
draw over this anyway. */
- if (event->num_columns > 0 && event->start_row_or_col == 0)
+ if (event->num_columns > 0 && event->start_row_or_col == 0) {
+ g_object_unref (comp);
continue;
+ }
bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
bar_y -= y;
/* Skip it if it isn't visible. */
- if (bar_y >= height || bar_y + bar_h <= 0)
+ if (bar_y >= height || bar_y + bar_h <= 0) {
+ g_object_unref (comp);
continue;
+ }
cairo_rectangle (cr, grid_x, bar_y,
E_DAY_VIEW_BAR_WIDTH - 2, bar_h);
@@ -1169,14 +1185,18 @@
/* If the event is TRANSPARENT, skip it. */
e_cal_component_get_transparency (comp, &transparency);
- if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT)
+ if (transparency == E_CAL_COMPONENT_TRANSP_TRANSPARENT) {
+ g_object_unref (comp);
continue;
+ }
if (!e_day_view_find_long_event_days (event,
day_view->days_shown,
day_view->day_starts,
- &start_day, &end_day))
+ &start_day, &end_day)) {
+ g_object_unref (comp);
continue;
+ }
for (day = start_day; day <= end_day; day++) {
grid_x = day_view->day_offsets[day] + 1 - x;
Modified: trunk/calendar/gui/e-day-view-top-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-top-item.c (original)
+++ trunk/calendar/gui/e-day-view-top-item.c Mon Feb 18 11:10:10 2008
@@ -428,8 +428,10 @@
/* If we are editing the event we don't show the icons or the start
& end times. */
if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
- && day_view->editing_event_num == event_num)
+ && day_view->editing_event_num == event_num) {
+ g_object_unref (comp);
return;
+ }
/* Determine the position of the label, so we know where to place the
icons. Note that since the top canvas never scrolls we don't need
@@ -1048,8 +1050,11 @@
/* If we are editing the event we don't show the icons or the start
& end times. */
if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
- && day_view->editing_event_num == event_num)
+ && day_view->editing_event_num == event_num) {
+ g_object_unref (comp);
+ cairo_destroy (cr);
return;
+ }
/* Determine the position of the label, so we know where to place the
icons. Note that since the top canvas never scrolls we don't need
Modified: trunk/calendar/gui/e-day-view.c
==============================================================================
--- trunk/calendar/gui/e-day-view.c (original)
+++ trunk/calendar/gui/e-day-view.c Mon Feb 18 11:10:10 2008
@@ -5795,6 +5795,7 @@
text_x, item_y);
g_object_unref (layout);
+ g_object_unref (comp);
}
@@ -9085,8 +9086,10 @@
e_cal_component_commit_sequence (comp);
if (e_cal_component_is_instance (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE))
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ g_object_unref (comp);
return;
+ }
if (mod == CALOBJ_MOD_THIS) {
e_cal_component_set_rdate_list (comp, NULL);
Modified: trunk/calendar/gui/e-memo-table.c
==============================================================================
--- trunk/calendar/gui/e-memo-table.c (original)
+++ trunk/calendar/gui/e-memo-table.c Mon Feb 18 11:10:10 2008
@@ -764,6 +764,7 @@
medit = COMP_EDITOR (memo_editor_new (comp_data->client, flags));
comp_editor_edit_comp (medit, comp);
+ g_object_unref (comp);
e_comp_editor_registry_add (comp_editor_registry, medit, FALSE);
}
Modified: trunk/calendar/gui/e-week-view.c
==============================================================================
--- trunk/calendar/gui/e-week-view.c (original)
+++ trunk/calendar/gui/e-week-view.c Mon Feb 18 11:10:10 2008
@@ -2525,9 +2525,9 @@
e_week_view_reshape_event_span (week_view, event_num,
span_num);
- current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
if (week_view->last_edited_comp_string == NULL)
continue;
+ current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
if (strncmp (current_comp_string, week_view->last_edited_comp_string,50) == 0) {
EWeekViewEventSpan *span;
span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
Modified: trunk/calendar/gui/migration.c
==============================================================================
--- trunk/calendar/gui/migration.c (original)
+++ trunk/calendar/gui/migration.c Mon Feb 18 11:10:10 2008
@@ -279,6 +279,7 @@
break;
} while (conflict);
+ g_strfreev (p);
return g_string_free (s, FALSE);
}
Modified: trunk/calendar/gui/print.c
==============================================================================
--- trunk/calendar/gui/print.c (original)
+++ trunk/calendar/gui/print.c Mon Feb 18 11:10:10 2008
@@ -1992,8 +1992,10 @@
x = left;
xend = right - 2;
- if (y > bottom)
+ if (y > bottom) {
+ g_object_unref (comp);
break;
+ }
/* Print the box to put the tick in. */
print_border (context, x + 2, x + 8, y + 6, y + 15, 0.1, -1.0);
Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c (original)
+++ trunk/composer/e-msg-composer.c Mon Feb 18 11:10:10 2008
@@ -2962,7 +2962,7 @@
g_free (str);
}
- g_free (urls);
+ g_strfreev (urls);
success = TRUE;
break;
case DND_TYPE_TEXT_VCARD:
Modified: trunk/e-util/e-config.c
==============================================================================
--- trunk/e-util/e-config.c (original)
+++ trunk/e-util/e-config.c Mon Feb 18 11:10:10 2008
@@ -135,7 +135,7 @@
g_free(wn);
}
- while ( (cn = (struct _check_node *)e_dlist_remhead(&p->widgets)) ) {
+ while ( (cn = (struct _check_node *)e_dlist_remhead(&p->checks)) ) {
g_free(cn->pageid);
g_free(cn);
}
Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c (original)
+++ trunk/mail/em-folder-view.c Mon Feb 18 11:10:10 2008
@@ -664,6 +664,7 @@
g_free (filename);
filename = g_strdup_printf ("current_wide_view-%s.xml", safe_id);
p->view_instance->current_view_filename = g_build_filename (collection->local_dir, filename, NULL);
+ g_free (filename);
g_free (safe_id);
}
g_free (id);
Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c (original)
+++ trunk/mail/mail-component.c Mon Feb 18 11:10:10 2008
@@ -489,6 +489,7 @@
g_free (priv->context_path);
g_mutex_free(priv->lock);
+ g_object_unref (priv->model);
g_object_unref (priv->logger);
g_free (priv);
Modified: trunk/mail/message-list.c
==============================================================================
--- trunk/mail/message-list.c (original)
+++ trunk/mail/message-list.c Mon Feb 18 11:10:10 2008
@@ -1493,8 +1493,11 @@
char **sender_name = NULL;
str = camel_message_info_from (msg_info);
if(str && str[0] != '\0'){
- sender_name=g_strsplit(str,"<",2);
- return (void *)(*sender_name);
+ char *res;
+ sender_name = g_strsplit (str,"<",2);
+ res = g_strdup (*sender_name);
+ g_strfreev (sender_name);
+ return (void *)(res);
}
else
return (void *)("");
Modified: trunk/plugins/external-editor/external-editor.c
==============================================================================
--- trunk/plugins/external-editor/external-editor.c (original)
+++ trunk/plugins/external-editor/external-editor.c Mon Feb 18 11:10:10 2008
@@ -41,6 +41,7 @@
camel_internet_address_add (cia, " ", address_tokens [i]);
d(printf ("\nAdding camel_internet_address[%s] \n", address_tokens [i]));
}
+ g_strfreev (address_tokens);
return cia;
}
@@ -139,6 +140,8 @@
g_signal_connect (GTK_OBJECT (composer), "save-draft", G_CALLBACK (em_utils_composer_save_draft_cb), NULL);
gtk_widget_show (GTK_WIDGET (composer));
+
+ g_strfreev (tokens);
}
}
#else
Modified: trunk/plugins/groupwise-features/install-shared.c
==============================================================================
--- trunk/plugins/groupwise-features/install-shared.c (original)
+++ trunk/plugins/groupwise-features/install-shared.c Mon Feb 18 11:10:10 2008
@@ -97,6 +97,7 @@
camel_exception_init (&ex);
if (!(store = (CamelStore *) camel_session_get_service (mail_component_peek_session(NULL), uri, CAMEL_PROVIDER_STORE, &ex))) {
camel_exception_clear (&ex);
+ g_strfreev (names);
return;
}
@@ -122,12 +123,15 @@
camel_exception_init (&ex);
if (!(provider = camel_provider_get(uri, &ex))) {
camel_exception_clear (&ex);
+ g_strfreev (names);
return;
}
/* make sure the new store belongs in the tree */
- if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+ if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) {
+ g_strfreev (names);
return;
+ }
em_folder_tree_model_add_store (model, store, account->name);
camel_object_unref (store);
Modified: trunk/plugins/groupwise-features/send-options.c
==============================================================================
--- trunk/plugins/groupwise-features/send-options.c (original)
+++ trunk/plugins/groupwise-features/send-options.c Mon Feb 18 11:10:10 2008
@@ -374,6 +374,7 @@
if (so_uri) {
if (!strcmp (so_uri, uri)) {
g_free (so_uri), so_uri = NULL;
+ g_strfreev (temp);
return E_SOURCE (r->data);
}
g_free (so_uri), so_uri = NULL;
Modified: trunk/plugins/groupwise-features/share-folder-common.c
==============================================================================
--- trunk/plugins/groupwise-features/share-folder-common.c (original)
+++ trunk/plugins/groupwise-features/share-folder-common.c Mon Feb 18 11:10:10 2008
@@ -531,8 +531,9 @@
g_free (name);
}
e_gw_connection_free_container_list (container_list);
- if (names)
- g_strfreev(names);
}
+
+ if (names)
+ g_strfreev (names);
return id;
}
Modified: trunk/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- trunk/plugins/itip-formatter/itip-formatter.c (original)
+++ trunk/plugins/itip-formatter/itip-formatter.c Mon Feb 18 11:10:10 2008
@@ -1598,12 +1598,17 @@
{
struct _itip_puri *pitip = data;
struct _opencal_msg *m;
+ char *start, *end;
+ start = isodate_from_time_t (pitip->start_time);
+ end = isodate_from_time_t (pitip->end_time);
m = mail_msg_new (&open_calendar_info);
- m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"",
- isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time));
+ m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", start, end);
mail_msg_slow_ordered_push (m);
+ g_free (start);
+ g_free (end);
+
return FALSE;
}
Modified: trunk/widgets/misc/e-calendar-item.c
==============================================================================
--- trunk/widgets/misc/e-calendar-item.c (original)
+++ trunk/widgets/misc/e-calendar-item.c Mon Feb 18 11:10:10 2008
@@ -1678,8 +1678,10 @@
/* Just return if the month is outside the given area. */
if (month_x >= width || month_x + calitem->month_width <= 0
- || month_y >= height || month_y + calitem->month_height <= 0)
+ || month_y >= height || month_y + calitem->month_height <= 0) {
+ cairo_destroy (cr);
return;
+ }
month = calitem->month + row * calitem->cols + col;
year = calitem->year + month / 12;
@@ -1746,6 +1748,7 @@
if (clip_width <= 0 || clip_height <= 0) {
g_object_unref (layout);
+ cairo_destroy (cr);
return;
}
Modified: trunk/widgets/misc/e-cursors.c
==============================================================================
--- trunk/widgets/misc/e-cursors.c (original)
+++ trunk/widgets/misc/e-cursors.c Mon Feb 18 11:10:10 2008
@@ -115,11 +115,11 @@
e_color_init ();
for (i = 0; cursors [i].hot_x; i++){
- GdkBitmap *bitmap = NULL, *mask = NULL;
-
if (cursors [i].hot_x < 0)
cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
else {
+ GdkBitmap *bitmap = NULL, *mask = NULL;
+
create_bitmap_and_mask_from_xpm (&bitmap, &mask, cursors [i].xpm);
/* The foreground and background colours are reversed.
@@ -131,6 +131,9 @@
&e_black, &e_white,
cursors [i].hot_x,
cursors [i].hot_y);
+
+ g_object_unref (bitmap);
+ g_object_unref (mask);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]