aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-06 11:12:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-06 11:12:55 +0800
commitf1acdb920f9e18040ff421c55d9cd0f1c1354171 (patch)
treeb180d14849b85dbd19f79c98b0d46de11e7eafcb
parent7c4ce285d03821cbb13cadd74ae491abed3c3bdf (diff)
parent95a1645fc577bc56f44cac5887e72ca785e140e1 (diff)
downloadgsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar.gz
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar.bz2
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar.lz
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar.xz
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.tar.zst
gsoc2013-evolution-f1acdb920f9e18040ff421c55d9cd0f1c1354171.zip
Merge branch 'master' into vcard-inline
-rw-r--r--widgets/misc/e-attachment-view.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index f85fcdbace..27ef5d84a8 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -431,7 +431,7 @@ attachment_view_text_calendar (EAttachmentView *view,
gchar *content_type;
gint length;
- if (G_UNLIKELY (atom = GDK_NONE))
+ if (G_UNLIKELY (atom == GDK_NONE))
atom = gdk_atom_intern_static_string ("text/calendar");
if (gtk_selection_data_get_target (selection_data) != atom)
@@ -487,7 +487,7 @@ attachment_view_text_x_vcard (EAttachmentView *view,
gchar *content_type;
gint length;
- if (G_UNLIKELY (atom = GDK_NONE))
+ if (G_UNLIKELY (atom == GDK_NONE))
atom = gdk_atom_intern_static_string ("text/x-vcard");
if (gtk_selection_data_get_target (selection_data) != atom)