diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 03:22:22 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 03:42:04 +0800 |
| commit | c3191ec86b0f711af58a9a902b7464f8f958fe2c (patch) | |
| tree | 413ef7f6c6251d05ffbdd6c0d01eb67a740c9689 /widgets | |
| parent | 7961048944d446f523a9ed12c811d7c2e8a47e97 (diff) | |
| download | gsoc2013-evolution-c3191ec86b0f711af58a9a902b7464f8f958fe2c.tar.gz gsoc2013-evolution-c3191ec86b0f711af58a9a902b7464f8f958fe2c.tar.zst gsoc2013-evolution-c3191ec86b0f711af58a9a902b7464f8f958fe2c.zip | |
Bump the required GLib and GTK+ versions to latest stable.
We now require GLib >= 2.20 and GTK+ >= 2.16. Also removed all
GLIB_CHECK_VERSION and GTK_CHECK_VERSION workarounds for older versions.
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/e-attachment-paned.c | 4 | ||||
| -rw-r--r-- | widgets/misc/e-attachment-view.c | 2 | ||||
| -rw-r--r-- | widgets/misc/e-attachment.c | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 853ff48cb2..3fed031473 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -590,11 +590,7 @@ attachment_paned_init (EAttachmentPaned *paned) view = E_ATTACHMENT_VIEW (paned->priv->icon_view); action = e_attachment_view_get_action (view, "add"); gtk_button_set_image (GTK_BUTTON (widget), gtk_image_new ()); -#if GTK_CHECK_VERSION(2,16,0) gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action); -#else - gtk_action_connect_proxy (action, widget); /* XXX Deprecated */ -#endif gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 53f719c787..2ad34d6751 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -650,9 +650,7 @@ attachment_view_update_actions (EAttachmentView *view) action = gtk_action_new ( action_name, action_label, action_tooltip, NULL); -#if GTK_CHECK_VERSION(2,16,0) gtk_action_set_gicon (action, app_icon); -#endif g_object_set_data_full ( G_OBJECT (action), diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index f472a26ff3..537a3470d7 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -2534,11 +2534,7 @@ attachment_save_query_info_cb (GFile *destination, replace: g_file_replace_async ( destination, NULL, FALSE, -#if GLIB_CHECK_VERSION(2,20,0) G_FILE_CREATE_REPLACE_DESTINATION, -#else - G_FILE_CREATE_NONE, -#endif G_PRIORITY_DEFAULT, cancellable, (GAsyncReadyCallback) attachment_save_replace_cb, save_context); |