From 84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Jun 2009 14:48:29 +0200 Subject: Fix even more compiler warnings and disable one for format strings --- calendar/conduits/calendar/calendar-conduit.c | 7 ++++--- calendar/conduits/memo/memo-conduit.c | 7 ++++--- calendar/conduits/todo/todo-conduit.c | 7 ++++--- calendar/gui/e-cal-model-tasks.c | 2 +- calendar/gui/print.c | 6 ++---- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'calendar') diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index e899ad203d..04f7c424dd 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -123,7 +123,7 @@ calconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; /* Sync Type */ - management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -400,7 +400,8 @@ print_local (ECalLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -2104,7 +2105,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"DatebookDB", 0x64617465); g_assert (retval != NULL); ctxt = e_calendar_context_new (pilot_id); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index b22216eecd..8fae261828 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -126,7 +126,7 @@ memoconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -314,7 +314,8 @@ print_local (EMemoLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -1382,7 +1383,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("MemoDB", 0x6D656D6F); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"MemoDB", 0x6D656D6F); g_assert (retval != NULL); ctxt = e_memo_context_new (pilot_id); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 7ff2161772..b5bfc5b996 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -128,7 +128,7 @@ todoconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -385,7 +385,8 @@ print_local (EToDoLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -1572,7 +1573,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"ToDoDB", 0x746F646F); g_assert (retval != NULL); ctxt = e_todo_context_new (pilot_id); diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 63749c5aaa..63bc37af4e 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -329,7 +329,7 @@ get_priority (ECalModelComponent *comp_data) prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY); if (prop) - return e_cal_util_priority_to_string (icalproperty_get_priority (prop)); + return (gpointer) e_cal_util_priority_to_string (icalproperty_get_priority (prop)); return (gpointer) ""; } diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 6931474349..eced381faa 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -2587,11 +2587,9 @@ print_comp_draw_real (GtkPrintOperation *operation, /* Priority */ e_cal_component_get_priority (comp, &priority); if (priority && *priority >= 0) { - gchar *priority_string, *pri_text; + gchar *pri_text; - priority_string = e_cal_util_priority_to_string (*priority); - - pri_text = g_strdup_printf (_("Priority: %s"), priority_string); + pri_text = g_strdup_printf (_("Priority: %s"), e_cal_util_priority_to_string (*priority)); top = bound_text (context, font, pri_text, -1, 0.0, top, width, height, FALSE, &page_start, &pages); top += get_font_size (font) - 6; -- cgit v1.2.3