aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
commitfaf1c14c11f3e6026f786e9587715c10b13c723e (patch)
tree3dbf5816532cbea2510b4438c7c40d91fc426d3a /calendar/gui/dialogs
parent86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff)
downloadgsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip
Manual conflict resolution
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/comp-editor.c19
-rw-r--r--calendar/gui/dialogs/task-page.c4
2 files changed, 6 insertions, 17 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9405663a9b..e1a7a26f4d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -102,11 +102,6 @@ struct _CompEditorPrivate {
gchar *summary;
- /* Manages menus and toolbars */
- GtkUIManager *manager;
-
- gchar *summary;
-
guint32 attachment_bar_visible : 1;
/* TODO use this flags for setting all the boolean variables
@@ -167,7 +162,6 @@ static const gchar *ui =
"</ui>";
static void comp_editor_show_help (CompEditor *editor);
-static void setup_widgets (CompEditor *editor);
static void real_edit_comp (CompEditor *editor, ECalComponent *comp);
static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
@@ -506,7 +500,7 @@ save_comp (CompEditor *editor)
if (result && priv->mod == CALOBJ_MOD_THIS) {
/* FIXME do we really need to do this ? */
- if ((flags & COMP_EDITOR_DELEGATE) || !e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || itip_sentby_is_user (clone))
+ if ((flags & COMP_EDITOR_DELEGATE) || !e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || itip_sentby_is_user (clone, priv->client))
e_cal_component_commit_sequence (clone);
else
e_cal_component_abort_sequence (clone);
@@ -1959,11 +1953,10 @@ comp_editor_set_flags (CompEditor *editor,
g_object_notify (G_OBJECT (editor), "flags");
}
-GtkActionGroup *
-comp_editor_get_action_group (CompEditor *editor,
- const gchar *group_name)
+CompEditorFlags
+comp_editor_get_flags (CompEditor *editor)
{
- g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
+ g_return_val_if_fail (IS_COMP_EDITOR (editor), 0);
return editor->priv->flags;
}
@@ -2311,7 +2304,6 @@ fill_widgets (CompEditor *editor)
EAttachmentView *view;
CompEditorPrivate *priv;
GList *l;
- GtkAction *action;
view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
store = e_attachment_view_get_store (view);
@@ -2333,9 +2325,6 @@ fill_widgets (CompEditor *editor)
g_slist_free (attachment_list);
}
- action = comp_editor_get_action (editor, "classify-public");
- g_signal_handlers_block_by_func (action, G_CALLBACK (classification_changed_cb), editor);
-
for (l = priv->pages; l != NULL; l = l->next)
comp_editor_page_fill_widgets (l->data, priv->comp);
}
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 486b86ea34..4c5a5536ea 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1573,8 +1573,8 @@ categories_clicked_cb (GtkWidget *button,
{
GtkEntry *entry;
- entry = priv->categories;
- e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
+ entry = GTK_ENTRY (tpage->priv->categories);
+ e_categories_config_open_dialog_for_entry (entry);
}
static gboolean