From faf1c14c11f3e6026f786e9587715c10b13c723e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 25 Apr 2009 10:16:00 -0400 Subject: Manual conflict resolution --- calendar/gui/dialogs/comp-editor.c | 19 ++++--------------- calendar/gui/dialogs/task-page.c | 4 ++-- calendar/gui/e-cal-list-view.c | 2 +- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-calendar-view.c | 29 ----------------------------- calendar/gui/e-calendar-view.h | 1 - calendar/gui/e-memo-table.c | 14 +------------- 7 files changed, 9 insertions(+), 62 deletions(-) (limited to 'calendar/gui') 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 = ""; 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 diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index ea583a6edb..cfb77f8066 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -358,9 +358,9 @@ e_cal_list_view_destroy (GtkObject *object) static void e_cal_list_view_show_popup_menu (ECalListView *cal_list_view, gint row, GdkEvent *gdk_event) { +#if 0 /* KILL-BONOBO */ GtkMenu *menu; -#if 0 /* KILL-BONOBO */ menu = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (cal_list_view)); gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time()); #endif diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 74d22efe29..6eecb856b0 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -299,7 +299,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table, return FALSE; etable = e_calendar_table_get_table (cal_table); - e_table_get_mouse_over_cell (etable, x, y, &row, &col); + e_table_get_mouse_over_cell (etable, &row, &col); if (row == -1 || !etable) return FALSE; diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index ddd08556fa..848a54ffa3 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -906,35 +906,6 @@ clipboard_paste_received_cb (GtkClipboard *clipboard, g_object_unref (data); } -static void -e_calendar_view_paste_text (ECalendarView *cal_view) -{ - g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); - - if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text) - E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text (cal_view); -} - -static void -clipboard_paste_received_cb (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer data) -{ - if (gtk_clipboard_wait_is_text_available (clipboard)) { - e_calendar_view_paste_text (E_CALENDAR_VIEW (data)); - } else { - GdkAtom type = selection_data->type; - if (type == gdk_atom_intern (target_types[TARGET_TYPE_VCALENDAR].target, TRUE)) { - gchar *result = NULL; - result = g_strndup ((const gchar *) selection_data->data, - selection_data->length); - clipboard_get_calendar_data (E_CALENDAR_VIEW (data), result); - g_free (result); - } - } - g_object_unref (data); -} - void e_calendar_view_paste_clipboard (ECalendarView *cal_view) { diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 5ea596ad5d..e5d8478b8e 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -27,7 +27,6 @@ #include #include "e-cal-model.h" #include "gnome-cal.h" -#include "e-activity-handler.h" G_BEGIN_DECLS diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index abaad08695..891bec6d32 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -186,18 +186,6 @@ memo_table_double_click_cb (EMemoTable *memo_table, memo_table_emit_open_component (memo_table, comp_data); } -static gboolean -query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data) -{ - EMemoTable *memo_table; - - g_return_val_if_fail (E_IS_MEMO_TABLE (user_data), FALSE); - - memo_table = E_MEMO_TABLE (user_data); - - return ec_query_tooltip (widget, x, y, keyboard_mode, tooltip, GTK_WIDGET (e_memo_table_get_table (memo_table)), memo_table->model); -} - static void memo_table_model_cal_view_progress_cb (EMemoTable *memo_table, const gchar *message, @@ -249,7 +237,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table, return FALSE; etable = e_memo_table_get_table (memo_table); - e_table_get_mouse_over_cell (etable, x, y, &row, &col); + e_table_get_mouse_over_cell (etable, &row, &col); if (row == -1 || !etable) return FALSE; -- cgit