aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-08-19 00:18:42 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-19 00:18:42 +0800
commit4187293731274274e4283d9039f6e30c95578118 (patch)
treeab8ce6e6bc9316846097b827157e0f664cf57634 /calendar/gui
parent28b28bf057056d2aa28458b322319bf679608ae5 (diff)
downloadgsoc2013-evolution-4187293731274274e4283d9039f6e30c95578118.tar.gz
gsoc2013-evolution-4187293731274274e4283d9039f6e30c95578118.tar.zst
gsoc2013-evolution-4187293731274274e4283d9039f6e30c95578118.zip
Merge revisions 35993:36015 from trunk.
Adapt recent "crash recovery" changes to new architecture. svn path=/branches/kill-bonobo/; revision=36018
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/calendar-component.c3
-rw-r--r--calendar/gui/gnome-cal.c3
-rw-r--r--calendar/gui/memos-component.c1
-rw-r--r--calendar/gui/tasks-component.c1
4 files changed, 6 insertions, 2 deletions
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 4dff00825c..5ba3b11e96 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -802,7 +802,7 @@ set_info (CalendarComponentView *component_view)
g_return_if_reached ();
}
- e_info_label_set_info (component_view->info_label, _("Calendar"), buffer);
+ e_info_label_set_info (component_view->info_label, _("Calendars"), buffer);
}
static void
@@ -1550,6 +1550,7 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
static GNOME_Evolution_ComponentView
impl_createView (PortableServer_Servant servant,
GNOME_Evolution_ShellView parent,
+ CORBA_boolean select_item,
CORBA_Environment *ev)
{
CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index d2fd8f551b..4d65f094b8 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2870,7 +2870,8 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
/* FIXME Is there a better way to handle this? */
- g_object_unref (priv->default_client[source_type]);
+ if (priv->default_client[source_type])
+ g_object_unref (priv->default_client[source_type]);
priv->default_client[source_type] = NULL;
g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 31280d52cb..adf54c5c2d 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -1215,6 +1215,7 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
static GNOME_Evolution_ComponentView
impl_createView (PortableServer_Servant servant,
GNOME_Evolution_ShellView parent,
+ CORBA_boolean select_item,
CORBA_Environment *ev)
{
MemosComponent *component = MEMOS_COMPONENT (bonobo_object_from_servant (servant));
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index d976202a8c..ac272c83d1 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -1207,6 +1207,7 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
static GNOME_Evolution_ComponentView
impl_createView (PortableServer_Servant servant,
GNOME_Evolution_ShellView parent,
+ CORBA_boolean select_item,
CORBA_Environment *ev)
{
TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));