aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-15 23:16:25 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-01-16 10:50:05 +0800
commitcae22334fa6bc395ccc421b09e0af94c89297c41 (patch)
tree84881f467c0448db044d8bb3533e044a7152bb2b /modules/calendar
parentd37784ed3db20fd74ea4b8d9fdfe58518370cea2 (diff)
downloadgsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.gz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.bz2
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.lz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.xz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.zst
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.zip
Remove dead assignments found by clang.
Diffstat (limited to 'modules/calendar')
-rw-r--r--modules/calendar/e-cal-shell-backend.c8
-rw-r--r--modules/calendar/e-cal-shell-content.c12
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c5
-rw-r--r--modules/calendar/e-cal-shell-view.c5
-rw-r--r--modules/calendar/e-memo-shell-content.c2
-rw-r--r--modules/calendar/e-memo-shell-migrate.c4
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c5
-rw-r--r--modules/calendar/e-memo-shell-view.c6
-rw-r--r--modules/calendar/e-task-shell-content.c2
-rw-r--r--modules/calendar/e-task-shell-sidebar.c5
-rw-r--r--modules/calendar/e-task-shell-view-private.c2
-rw-r--r--modules/calendar/e-task-shell-view.c6
12 files changed, 3 insertions, 59 deletions
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index e70daec074..bf6f2e1189 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -530,8 +530,6 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
gchar *source_uid = NULL;
gchar *comp_uid = NULL;
gchar *comp_rid = NULL;
- time_t startdate = -1;
- time_t enddate = -1;
gboolean handled = FALSE;
GError *error = NULL;
@@ -565,11 +563,7 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
content_len = strcspn (cp, "&");
content = g_strndup (cp, content_len);
- if (g_ascii_strcasecmp (header, "startdate") == 0)
- startdate = time_from_isodate (content);
- else if (g_ascii_strcasecmp (header, "enddate") == 0)
- enddate = time_from_isodate (content);
- else if (g_ascii_strcasecmp (header, "source-uid") == 0)
+ if (g_ascii_strcasecmp (header, "source-uid") == 0)
source_uid = g_strdup (content);
else if (g_ascii_strcasecmp (header, "comp-uid") == 0)
comp_uid = g_strdup (content);
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 5213480cee..67081ce978 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -227,17 +227,6 @@ cal_shell_content_dispose (GObject *object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
-static void
-cal_shell_content_finalize (GObject *object)
-{
- ECalShellContentPrivate *priv;
-
- priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (object);
-
- /* Chain up to parent's finalize() method. */
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
static time_t
gc_get_default_time (ECalModel *model, gpointer user_data)
{
@@ -500,7 +489,6 @@ cal_shell_content_class_init (ECalShellContentClass *class)
object_class->set_property = cal_shell_content_set_property;
object_class->get_property = cal_shell_content_get_property;
object_class->dispose = cal_shell_content_dispose;
- object_class->finalize = cal_shell_content_finalize;
object_class->constructed = cal_shell_content_constructed;
widget_class = GTK_WIDGET_CLASS (class);
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index cfe852afed..62fc30202f 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -166,9 +166,6 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
EShellView *shell_view;
EShellWindow *shell_window;
EShellSidebar *shell_sidebar;
- ESource *source;
-
- source = e_cal_get_source (client);
shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar);
shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
@@ -786,7 +783,6 @@ void
e_cal_shell_sidebar_remove_source (ECalShellSidebar *cal_shell_sidebar,
ESource *source)
{
- ESourceSelector *selector;
GHashTable *client_table;
ECal *client;
const gchar *uid;
@@ -795,7 +791,6 @@ e_cal_shell_sidebar_remove_source (ECalShellSidebar *cal_shell_sidebar,
g_return_if_fail (E_IS_SOURCE (source));
client_table = cal_shell_sidebar->priv->client_table;
- selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
uid = e_source_peek_uid (source);
client = g_hash_table_lookup (client_table, uid);
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index c2eac56216..cd44f37c56 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -280,7 +280,6 @@ cal_shell_view_update_actions (EShellView *shell_view)
GnomeCalendarViewType view_type;
GnomeCalendar *calendar;
ECalendarView *view;
- ECalModel *model;
GtkAction *action;
GList *list, *iter;
gboolean sensitive;
@@ -291,7 +290,6 @@ cal_shell_view_update_actions (EShellView *shell_view)
gboolean can_delete_primary_source;
gboolean editable = TRUE;
gboolean has_primary_source;
- gboolean primary_source_is_system;
gboolean recurring = FALSE;
gboolean is_instance = FALSE;
gboolean is_meeting = FALSE;
@@ -309,7 +307,6 @@ cal_shell_view_update_actions (EShellView *shell_view)
calendar = e_cal_shell_content_get_calendar (cal_shell_content);
view_type = gnome_calendar_get_view (calendar);
view = gnome_calendar_get_calendar_view (calendar, view_type);
- model = e_calendar_view_get_model (view);
list = e_calendar_view_get_selected_events (view);
n_selected = g_list_length (list);
@@ -373,8 +370,6 @@ cal_shell_view_update_actions (EShellView *shell_view)
(state & E_CAL_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE);
can_delete_primary_source =
(state & E_CAL_SHELL_SIDEBAR_CAN_DELETE_PRIMARY_SOURCE);
- primary_source_is_system =
- (state & E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_SYSTEM);
refresh_supported =
(state & E_CAL_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH);
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 709ae9a8e6..852c0bbf42 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -189,14 +189,12 @@ memo_shell_content_cursor_change_cb (EMemoShellContent *memo_shell_content,
ETable *table)
{
ECalComponentPreview *memo_preview;
- EMemoTable *memo_table;
ECalModel *memo_model;
ECalModelComponent *comp_data;
ECalComponent *comp;
const gchar *uid;
memo_model = e_memo_shell_content_get_memo_model (memo_shell_content);
- memo_table = e_memo_shell_content_get_memo_table (memo_shell_content);
memo_preview = e_memo_shell_content_get_memo_preview (memo_shell_content);
if (e_table_selected_count (table) != 1) {
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index c2e4689576..f4ccaa5277 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -171,7 +171,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar
return;
soap_port = camel_url_get_param (url, "soap_port");
- if (!soap_port || strlen (soap_port) == 0)
+ if (soap_port == NULL || *soap_port == '\0')
soap_port = "7191";
use_ssl = camel_url_get_param (url, "use_ssl");
@@ -185,7 +185,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar
source = e_source_new (source_name, relative_uri);
e_source_set_property (source, "auth", "1");
e_source_set_property (source, "username", url->user);
- e_source_set_property (source, "port", camel_url_get_param (url, "soap_port"));
+ e_source_set_property (source, "port", soap_port);
e_source_set_property (source, "auth-domain", "Groupwise");
e_source_set_property (source, "use_ssl", use_ssl);
e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 46ff03672a..403e733d22 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -163,9 +163,6 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
EShellView *shell_view;
EShellWindow *shell_window;
EShellSidebar *shell_sidebar;
- ESource *source;
-
- source = e_cal_get_source (client);
shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar);
shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
@@ -713,7 +710,6 @@ void
e_memo_shell_sidebar_remove_source (EMemoShellSidebar *memo_shell_sidebar,
ESource *source)
{
- ESourceSelector *selector;
GHashTable *client_table;
ECal *client;
const gchar *uid;
@@ -722,7 +718,6 @@ e_memo_shell_sidebar_remove_source (EMemoShellSidebar *memo_shell_sidebar,
g_return_if_fail (E_IS_SOURCE (source));
client_table = memo_shell_sidebar->priv->client_table;
- selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar);
uid = e_source_peek_uid (source);
client = g_hash_table_lookup (client_table, uid);
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index 0afbe18e77..07a58aa1c9 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -163,7 +163,6 @@ memo_shell_view_execute_search (EShellView *shell_view)
static void
memo_shell_view_update_actions (EShellView *shell_view)
{
- EMemoShellViewPrivate *priv;
EShellContent *shell_content;
EShellSidebar *shell_sidebar;
EShellWindow *shell_window;
@@ -177,7 +176,6 @@ memo_shell_view_update_actions (EShellView *shell_view)
gboolean can_delete_primary_source;
gboolean has_primary_source;
gboolean multiple_memos_selected;
- gboolean primary_source_is_system;
gboolean selection_has_url;
gboolean single_memo_selected;
gboolean sources_are_editable;
@@ -186,8 +184,6 @@ memo_shell_view_update_actions (EShellView *shell_view)
/* Chain up to parent's update_actions() method. */
E_SHELL_VIEW_CLASS (parent_class)->update_actions (shell_view);
- priv = E_MEMO_SHELL_VIEW_GET_PRIVATE (shell_view);
-
shell_window = e_shell_view_get_shell_window (shell_view);
shell_content = e_shell_view_get_shell_content (shell_view);
@@ -209,8 +205,6 @@ memo_shell_view_update_actions (EShellView *shell_view)
(state & E_MEMO_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE);
can_delete_primary_source =
(state & E_MEMO_SHELL_SIDEBAR_CAN_DELETE_PRIMARY_SOURCE);
- primary_source_is_system =
- (state & E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_SYSTEM);
refresh_supported =
(state & E_MEMO_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH);
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 6727dd1bcd..11bc28af62 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -189,14 +189,12 @@ task_shell_content_cursor_change_cb (ETaskShellContent *task_shell_content,
ETable *table)
{
ECalComponentPreview *task_preview;
- ETaskTable *task_table;
ECalModel *task_model;
ECalModelComponent *comp_data;
ECalComponent *comp;
const gchar *uid;
task_model = e_task_shell_content_get_task_model (task_shell_content);
- task_table = e_task_shell_content_get_task_table (task_shell_content);
task_preview = e_task_shell_content_get_task_preview (task_shell_content);
if (e_table_selected_count (table) != 1) {
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index eb5da18ffd..992ccf8b91 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -161,9 +161,6 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
EShellView *shell_view;
EShellWindow *shell_window;
EShellSidebar *shell_sidebar;
- ESource *source;
-
- source = e_cal_get_source (client);
shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar);
shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
@@ -711,7 +708,6 @@ void
e_task_shell_sidebar_remove_source (ETaskShellSidebar *task_shell_sidebar,
ESource *source)
{
- ESourceSelector *selector;
GHashTable *client_table;
ECal *client;
const gchar *uid;
@@ -720,7 +716,6 @@ e_task_shell_sidebar_remove_source (ETaskShellSidebar *task_shell_sidebar,
g_return_if_fail (E_IS_SOURCE (source));
client_table = task_shell_sidebar->priv->client_table;
- selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
uid = e_source_peek_uid (source);
client = g_hash_table_lookup (client_table, uid);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index dfa00f73ba..6704a3b4c0 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -218,7 +218,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
EShellBackend *shell_backend;
EShellContent *shell_content;
EShellSidebar *shell_sidebar;
- EShellTaskbar *shell_taskbar;
EShellSettings *shell_settings;
EShellWindow *shell_window;
ETaskTable *task_table;
@@ -229,7 +228,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
shell_backend = e_shell_view_get_shell_backend (shell_view);
shell_content = e_shell_view_get_shell_content (shell_view);
shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
- shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
shell = e_shell_window_get_shell (shell_window);
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index 42fa4dd9d0..36b9db5b56 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -276,7 +276,6 @@ task_shell_view_execute_search (EShellView *shell_view)
static void
task_shell_view_update_actions (EShellView *shell_view)
{
- ETaskShellViewPrivate *priv;
EShellContent *shell_content;
EShellSidebar *shell_sidebar;
EShellWindow *shell_window;
@@ -290,7 +289,6 @@ task_shell_view_update_actions (EShellView *shell_view)
gboolean can_delete_primary_source;
gboolean has_primary_source;
gboolean multiple_tasks_selected;
- gboolean primary_source_is_system;
gboolean selection_has_url;
gboolean selection_is_assignable;
gboolean single_task_selected;
@@ -302,8 +300,6 @@ task_shell_view_update_actions (EShellView *shell_view)
/* Chain up to parent's update_actions() method. */
E_SHELL_VIEW_CLASS (parent_class)->update_actions (shell_view);
- priv = E_TASK_SHELL_VIEW_GET_PRIVATE (shell_view);
-
shell_window = e_shell_view_get_shell_window (shell_view);
shell_content = e_shell_view_get_shell_content (shell_view);
@@ -331,8 +327,6 @@ task_shell_view_update_actions (EShellView *shell_view)
(state & E_TASK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE);
can_delete_primary_source =
(state & E_TASK_SHELL_SIDEBAR_CAN_DELETE_PRIMARY_SOURCE);
- primary_source_is_system =
- (state & E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_SYSTEM);
refresh_supported =
(state & E_TASK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH);