summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-19 15:45:02 +0200
committerinfirit <[email protected]>2014-05-19 18:37:37 +0200
commitcc28312a3f00a21d7fdf982ae9abce782878d906 (patch)
treef60c43c8d3f38edf57cff8745f05adaefa34990f /plugins
parent51291bf1b29004ea4703845fc127cc1a4468b092 (diff)
downloadpluma-cc28312a3f00a21d7fdf982ae9abce782878d906.tar.bz2
pluma-cc28312a3f00a21d7fdf982ae9abce782878d906.tar.xz
Drop support for gtk+ < 2.24
* Bump required gtk+2 version * Remove pluma-spinner * Remove pluma-message-are
Diffstat (limited to 'plugins')
-rw-r--r--plugins/checkupdate/pluma-check-update-plugin.c25
-rw-r--r--plugins/filebrowser/pluma-file-browser-widget.c8
2 files changed, 0 insertions, 33 deletions
diff --git a/plugins/checkupdate/pluma-check-update-plugin.c b/plugins/checkupdate/pluma-check-update-plugin.c
index 42cd2b41..23253f58 100644
--- a/plugins/checkupdate/pluma-check-update-plugin.c
+++ b/plugins/checkupdate/pluma-check-update-plugin.c
@@ -31,10 +31,6 @@
#include <gio/gio.h>
-#if !GTK_CHECK_VERSION(2, 17, 1)
-#include <pluma/pluma-message-area.h>
-#endif
-
#define SETTINGS_SCHEMA "org.mate.pluma.plugins.checkupdate"
#define SETTINGS_IGNORE_VERSION "ignore-version"
@@ -141,15 +137,10 @@ static void
set_contents (GtkWidget *infobar,
GtkWidget *contents)
{
-#if !GTK_CHECK_VERSION (2, 17, 1)
- pluma_message_area_set_contents (PLUMA_MESSAGE_AREA (infobar),
- contents);
-#else
GtkWidget *content_area;
content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
gtk_container_add (GTK_CONTAINER (content_area), contents);
-#endif
}
static void
@@ -278,21 +269,6 @@ create_infobar (PlumaWindow *window,
GtkWidget *infobar;
gchar *message;
-#if !GTK_CHECK_VERSION (2, 17, 1)
- infobar = pluma_message_area_new ();
-
- pluma_message_area_add_stock_button_with_text (PLUMA_MESSAGE_AREA (infobar),
- _("_Download"),
- GTK_STOCK_SAVE,
- GTK_RESPONSE_YES);
- pluma_message_area_add_stock_button_with_text (PLUMA_MESSAGE_AREA (infobar),
- _("_Ignore Version"),
- GTK_STOCK_DISCARD,
- GTK_RESPONSE_NO);
- pluma_message_area_add_button (PLUMA_MESSAGE_AREA (infobar),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-#else
GtkWidget *button;
infobar = gtk_info_bar_new ();
@@ -319,7 +295,6 @@ create_infobar (PlumaWindow *window,
gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar),
GTK_MESSAGE_INFO);
-#endif
message = g_strdup_printf ("%s (%s)", _("There is a new version of pluma"), version);
set_message_area_text_and_icon (infobar,
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index 6e6be102..5e975d9a 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -997,11 +997,7 @@ create_toolbar (PlumaFileBrowserWidget * obj,
"DirectoryPrevious");
g_object_set (action, "is_important", TRUE, "short_label",
_("Previous location"), NULL);
-#if GTK_CHECK_VERSION (2, 16, 0)
gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action);
-#else
- gtk_action_connect_proxy (action, widget);
-#endif
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget), 0);
/* Next directory menu tool item */
@@ -1022,11 +1018,7 @@ create_toolbar (PlumaFileBrowserWidget * obj,
"DirectoryNext");
g_object_set (action, "is_important", TRUE, "short_label",
_("Previous location"), NULL);
-#if GTK_CHECK_VERSION (2, 16, 0)
gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action);
-#else
- gtk_action_connect_proxy (action, widget);
-#endif
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget), 1);
gtk_box_pack_start (GTK_BOX (obj), toolbar, FALSE, FALSE, 0);