diff options
Diffstat (limited to 'plugins/itip-formatter')
| -rw-r--r-- | plugins/itip-formatter/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 6 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-view.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index 62346f4c17..793908ecad 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -7,9 +7,9 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h @@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) error_DATA = org-gnome-itip-formatter.error errordir = $(privdatadir)/errors diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 189362c102..9ab5895c3d 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2326,7 +2326,7 @@ view_response_cb (GtkWidget *widget, camel_message_info_free (mi); if (tag) { CamelStore *parent_store; - GSList *list = NULL; + GList *list = NULL; const gchar *full_name; gint i = 0, count; @@ -2339,7 +2339,7 @@ view_response_cb (GtkWidget *widget, if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) { camel_folder_summary_remove_uid_fast (pitip->folder->summary, (gchar *)(mi->uid)); camel_folder_change_info_remove_uid (changes, (gchar *) mi->uid); - list = g_slist_prepend (list, (gpointer) mi->uid); + list = g_list_prepend (list, (gpointer) mi->uid); /* step back once to have the right index */ count--; @@ -2351,7 +2351,7 @@ view_response_cb (GtkWidget *widget, full_name = camel_folder_get_full_name (pitip->folder); parent_store = camel_folder_get_parent_store (pitip->folder); camel_db_delete_uids (parent_store->cdb_w, full_name, list, NULL); - g_slist_free (list); + g_list_free (list); } } else { /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */ diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 149e01b185..5163d25e02 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -411,19 +411,19 @@ set_calendar_sender_text (ItipView *view) if (priv->organizer_sentby) sender = dupe_first_bold (_("%s through %s has canceled the following meeting:"), organizer, priv->organizer_sentby); else - sender = dupe_first_bold (_("%s has canceled the following meeting."), organizer, NULL); + sender = dupe_first_bold (_("%s has canceled the following meeting:"), organizer, NULL); break; case ITIP_VIEW_MODE_COUNTER: if (priv->attendee_sentby) sender = dupe_first_bold (_("%s through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby); else - sender = dupe_first_bold (_("%s has proposed the following meeting changes."), attendee, NULL); + sender = dupe_first_bold (_("%s has proposed the following meeting changes:"), attendee, NULL); break; case ITIP_VIEW_MODE_DECLINECOUNTER: if (priv->organizer_sentby) sender = dupe_first_bold (_("%s through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby); else - sender = dupe_first_bold (_("%s has declined the following meeting changes."), organizer, NULL); + sender = dupe_first_bold (_("%s has declined the following meeting changes:"), organizer, NULL); break; default: break; |