aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog14
-rw-r--r--calendar/gui/calendar-config.h2
-rw-r--r--calendar/gui/control-factory.c10
3 files changed, 20 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 55faefc160..3cee6b137e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-02 Jeffrey Stedfast <fejj@ximian.com>
+
+ * gui/control-factory.c (set_prop): Add a check to see if the view
+ should be the day-view and change the default to be whatever
+ calendar_config_get_default_view() returns. Should fix bug #39735.
+
+ * gui/calendar-config.h: calendar_config_write() and
+ calendar_config_write_on_exit() no longer exist. Removed
+ prototypes.
+
+ * gui/control-factory.c (set_prop): g_strcasecmp() is
+ deprecated. Since the values can never be anything other than all
+ lowercase anyway, just use strcmp.
+
2003-04-02 Rodrigo Moya <rodrigo@ximian.com>
Fixes #39262
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 6f0a9ee0fd..d1e18bcb65 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -61,8 +61,6 @@ typedef enum
void calendar_config_init (void);
-void calendar_config_write (void);
-void calendar_config_write_on_exit (void);
/*
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 3844cfdff3..413077de14 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -126,14 +126,16 @@ set_prop (BonoboPropertyBag *bag,
case PROPERTY_CALENDAR_VIEW_IDX:
string = BONOBO_ARG_GET_STRING (arg);
- if (!g_strcasecmp (string, "week"))
+ if (!strcmp (string, "week"))
view = GNOME_CAL_WEEK_VIEW;
- else if (!g_strcasecmp (string, "workweek"))
+ else if (!strcmp (string, "workweek"))
view = GNOME_CAL_WORK_WEEK_VIEW;
- else if (!g_strcasecmp (string, "month"))
+ else if (!strcmp (string, "month"))
view = GNOME_CAL_MONTH_VIEW;
- else
+ else if (!strcmp (string, "day"))
view = GNOME_CAL_DAY_VIEW;
+ else
+ view = calendar_config_get_default_view ();
/* This doesn't actually work, because the GalView
* comes along and resets the view. FIXME.