aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2006-01-22 13:48:53 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2006-01-22 13:48:53 +0800
commit9658f71e0e7d73761ad5ac7f029d62388cb2bab7 (patch)
treec6026f39aa6904dbe7c77d181903dd077636b5b1
parent11788dcb6f01686c4551e262c2c512f590ee6319 (diff)
downloadgsoc2013-evolution-9658f71e0e7d73761ad5ac7f029d62388cb2bab7.tar.gz
gsoc2013-evolution-9658f71e0e7d73761ad5ac7f029d62388cb2bab7.tar.zst
gsoc2013-evolution-9658f71e0e7d73761ad5ac7f029d62388cb2bab7.zip
Fix twenty odd compiler warnings and style oddness.
2006-01-22 Harish Krishnaswamy <kharish@novell.com> * icsimporter.c (get_menu_type), (dialog_response_cb), (dialog_close_cb), (get_icalcomponent_from_file): Fix twenty odd compiler warnings and style oddness. svn path=/trunk/; revision=31262
-rw-r--r--plugins/import-ics-attachments/ChangeLog6
-rw-r--r--plugins/import-ics-attachments/icsimporter.c31
2 files changed, 22 insertions, 15 deletions
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index 96a551455e..35fbc52e90 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-22 Harish Krishnaswamy <kharish@novell.com>
+
+ * icsimporter.c (get_menu_type), (dialog_response_cb),
+ (dialog_close_cb), (get_icalcomponent_from_file):
+ Fix twenty odd compiler warnings and style oddness.
+
2006-01-17 Harish Krishnaswamy <kharish@novell.com>
* import-ics-attachments : Initial commits. Plugin written and submitted by
diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 9556b7c3f0..577a5af7ca 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -34,6 +34,7 @@
#include <mail/mail-mt.h>
#include <mail/em-folder-view.h>
#include <mail/em-format-html-display.h>
+#include <mail/em-utils.h>
#include "e-attachment-bar.h"
#include <camel/camel-vee-folder.h>
#include "e-util/e-error.h"
@@ -45,6 +46,7 @@
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
#include <libical/icalvcal.h>
+#include <calendar/common/authentication.h>
typedef struct {
ECal *client;
@@ -78,12 +80,12 @@ popup_free (EPopup *ep, GSList *items, void *data)
static EPopupItem popup_calendar_items[] = {
{ E_POPUP_BAR, "25.display.00"},
- { E_POPUP_ITEM, "25.display.01", N_("_Import to Calendar"), import_ics, NULL, "stock_mail-import"}
+ { E_POPUP_ITEM, "25.display.01", N_("_Import to Calendar"), (EPopupActivateFunc)import_ics, NULL, "stock_mail-import"}
};
static EPopupItem popup_tasks_items[] = {
{ E_POPUP_BAR, "25.display.00"},
- { E_POPUP_ITEM, "25.display.01", N_("_Import to Tasks"), import_ics, NULL, "stock_mail-import"}
+ { E_POPUP_ITEM, "25.display.01", N_("_Import to Tasks"), (EPopupActivateFunc)import_ics, NULL, "stock_mail-import"}
};
@@ -138,7 +140,6 @@ get_menu_type (void *data)
{
CamelMimePart *part;
char *path;
- gint i=0;
icalcomponent *icalcomp, *subcomp;
icalcomponent_kind kind;
EPopupTarget *target = (EPopupTarget *) data;
@@ -160,7 +161,7 @@ get_menu_type (void *data)
} else if ( kind == ICAL_VEVENT_COMPONENT) {
return ICAL_VEVENT_COMPONENT;
}
- printf ("completed add_menu_type\n");
+ return ICAL_NO_COMPONENT;
}
static void
@@ -273,21 +274,21 @@ static void
dialog_response_cb (GtkDialog *dialog, gint response_id, ICalImporterData *icidata)
{
switch (response_id) {
- case GTK_RESPONSE_OK :
- import_items(icidata);
- break;
-
- case GTK_RESPONSE_CANCEL :
- case GTK_RESPONSE_DELETE_EVENT :
- gtk_signal_emit_by_name (dialog, "close");
- break;
+ case GTK_RESPONSE_OK :
+ import_items(icidata);
+ break;
+
+ case GTK_RESPONSE_CANCEL :
+ case GTK_RESPONSE_DELETE_EVENT :
+ gtk_signal_emit_by_name ((GtkObject *)dialog, "close");
+ break;
}
}
static void
dialog_close_cb (GtkDialog *dialog, ICalImporterData *icidata)
{
- gtk_widget_destroy (dialog);
+ gtk_widget_destroy ((GtkWidget *)dialog);
}
/* This removes all components except VEVENTs and VTIMEZONEs from the toplevel */
@@ -423,11 +424,11 @@ get_icalcomponent_from_file(char *filename)
char *contents;
icalcomponent *icalcomp;
- g_return_if_fail (filename != NULL);
+ g_return_val_if_fail (filename != NULL, NULL);
if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
g_free (filename);
- return;
+ return NULL;
}
g_free (filename);