patches/evolution-09-attachment.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 20053 50e2f1cd7c78
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17348
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     1
--- evolution-2.27.3/calendar/gui/dialogs/comp-editor.c.orig	2009-06-15 12:57:13.000000000 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     2
+++ evolution-2.27.3/calendar/gui/dialogs/comp-editor.c	2009-06-18 16:33:25.455462231 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     3
@@ -2229,6 +2229,29 @@ comp_editor_set_client (CompEditor *edit
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     4
 	if (editor->priv->source_client == NULL && client != NULL)
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     5
 		editor->priv->source_client = g_object_ref (client);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     6
 
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     7
+	/*
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     8
+	 * WCAP backend do not support attachment.
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     9
+	 * So disable attachment support in this case.
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    10
+	 */
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    11
+	const gchar *uri = e_cal_get_uri (client);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    12
+	if (uri) {
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    13
+		if (g_str_has_prefix (uri, "wcap://")) {
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    14
+			GtkWidget *widget;
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    15
+
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    16
+			widget = e_attachment_paned_get_controls_container (
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    17
+					editor->priv->attachment_view);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    18
+			gtk_widget_hide (widget);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    19
+			widget = gtk_ui_manager_get_widget (
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    20
+					editor->priv->ui_manager,
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    21
+					"/ui/main-menu/insert-menu");
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    22
+			gtk_widget_hide (widget);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    23
+			widget = gtk_ui_manager_get_widget (
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    24
+					editor->priv->ui_manager,
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    25
+					"/ui/main-toolbar/attach");
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    26
+			gtk_widget_hide (widget);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    27
+		}
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    28
+	}
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    29
+
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    30
 	g_object_notify (G_OBJECT (editor), "client");
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    31
 }
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    32