aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-03-24 00:43:23 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-03-24 00:43:23 +0800
commitdc28866623f68d54c272a7474731cb3c5998d600 (patch)
tree75d627de7884bd796e1f13f0845941d322674d2d
parent628c87cf3fd566cb6f1c68d847409d288f394edb (diff)
downloadgsoc2013-evolution-dc28866623f68d54c272a7474731cb3c5998d600.tar.gz
gsoc2013-evolution-dc28866623f68d54c272a7474731cb3c5998d600.tar.zst
gsoc2013-evolution-dc28866623f68d54c272a7474731cb3c5998d600.zip
remove unused variable
2004-03-23 JP Rosevear <jpr@ximian.com> * gui/dialogs/copy-source-dialog.c (copy_source): remove unused variable * gui/e-cal-model.c (e_cal_model_copy_component_data): make the precondition return NULL * gui/control-factory.c (get_prop): make sure this code isn't reached * gui/calendar-component.c (calendar_component_peek_source_selector): cast to kill warning svn path=/trunk/; revision=25159
-rw-r--r--calendar/ChangeLog14
-rw-r--r--calendar/gui/calendar-component.c2
-rw-r--r--calendar/gui/control-factory.c2
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.c1
-rw-r--r--calendar/gui/e-cal-model.c4
5 files changed, 19 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8d2c436ee9..5667ae6dc0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-23 JP Rosevear <jpr@ximian.com>
+
+ * gui/dialogs/copy-source-dialog.c (copy_source): remove unused
+ variable
+
+ * gui/e-cal-model.c (e_cal_model_copy_component_data): make the
+ precondition return NULL
+
+ * gui/control-factory.c (get_prop): make sure this code isn't
+ reached
+
+ * gui/calendar-component.c
+ (calendar_component_peek_source_selector): cast to kill warning
+
2004-03-23 Umesh Tiwari <tiwariumesh232@rediffmaiil.com>
For bug#53417
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 4e389ddfc6..cac131ed6d 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -1098,7 +1098,7 @@ calendar_component_peek_source_list (CalendarComponent *component)
ESourceSelector *
calendar_component_peek_source_selector (CalendarComponent *component)
{
- return component->priv->source_selector;
+ return E_SOURCE_SELECTOR (component->priv->source_selector);
}
EActivityHandler *
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index b114300b5a..f19acb0b4d 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -100,6 +100,8 @@ get_prop (BonoboPropertyBag *bag,
BONOBO_ARG_SET_STRING (arg, "list");
break;
default:
+ g_assert_not_reached ();
+ break;
}
break;
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 11768525c3..dca36f0771 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -43,7 +43,6 @@ show_error (GtkWindow *parent, const char *msg)
static gboolean
copy_source (CopySourceDialogData *csdd)
{
- char *uri;
ECal *source_client, *dest_client;
gboolean read_only = TRUE;
GList *obj_list = NULL;
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index c794b18859..95255c023f 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1753,8 +1753,8 @@ ECalModelComponent *
e_cal_model_copy_component_data (ECalModelComponent *comp_data)
{
ECalModelComponent *new_data;
-
- g_return_if_fail (comp_data != NULL);
+
+ g_return_val_if_fail (comp_data != NULL, NULL);
new_data = g_new0 (ECalModelComponent, 1);