aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-07 01:33:54 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-07 01:33:54 +0800
commit19b29348068e367efc105732e9707cdb4132b4ee (patch)
tree69f2aa1d16676f9b05c870f30cb970894b1a9cf0 /widgets/misc
parent9b1daa011124f49e149a4f78ef1eef6df38764de (diff)
parentdfb0db749801075ba67e24ac44de8fe9ac2ae2cc (diff)
downloadgsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar.gz
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar.bz2
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar.lz
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar.xz
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.tar.zst
gsoc2013-evolution-19b29348068e367efc105732e9707cdb4132b4ee.zip
Merge branch 'master' into kill-bonobo
Conflicts: shell/e-shell-window-commands.c
Diffstat (limited to 'widgets/misc')
-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)