move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

author: monsta <[email protected]> 2016-11-06 14:43:26 +0300
committer: monsta <[email protected]> 2016-11-06 14:43:26 +0300
commit: 4c06cb5cd0859067769dac1317682d430b18cc78 (patch)
tree: 0c363ee71311366fb2016df9858858ef5ef2d25d /plugins
parent: 65371f53dbb06180b750dad7c19e7bcf0f8651d6 (diff)
download: pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.bz2
pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.xz
9 files changed, 7 insertions, 110 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-utils.c b/plugins/filebrowser/pluma-file-browser-utils.c
index 8ffabfbe..3a232f8d 100644
--- a/plugins/filebrowser/pluma-file-browser-utils.c
+++ b/plugins/filebrowser/pluma-file-browser-utils.c
@@ -94,12 +94,8 @@ pluma_file_browser_utils_pixbuf_from_icon (GIcon * icon,
 return NULL;
 
 ret = gtk_icon_info_load_icon (info, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (info);
-#else
- gtk_icon_info_free (info);
-#endif
- 
+
 return ret;
 }
 
diff --git a/plugins/filebrowser/pluma-file-browser-view.c b/plugins/filebrowser/pluma-file-browser-view.c
index 847743b3..65728b0f 100644
--- a/plugins/filebrowser/pluma-file-browser-view.c
+++ b/plugins/filebrowser/pluma-file-browser-view.c
@@ -114,11 +114,7 @@ pluma_file_browser_view_finalize (GObject * object)
 PlumaFileBrowserView *obj = PLUMA_FILE_BROWSER_VIEW(object);
 
 if (obj->priv->hand_cursor)
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (obj->priv->hand_cursor);
-#else
- gdk_cursor_unref (obj->priv->hand_cursor);
-#endif
 
 if (obj->priv->hover_path)
 gtk_tree_path_free (obj->priv->hover_path);
@@ -129,11 +125,7 @@ pluma_file_browser_view_finalize (GObject * object)
 obj->priv->expand_state = NULL;
 }
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (obj->priv->busy_cursor);
-#else
- gdk_cursor_unref (obj->priv->busy_cursor);
-#endif
 
 G_OBJECT_CLASS (pluma_file_browser_view_parent_class)->
 finalize (object);
@@ -316,12 +308,8 @@ set_click_policy_property (PlumaFileBrowserView *obj,
 
 if (click_policy == PLUMA_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE) {
 if (obj->priv->hand_cursor == NULL)
-#if GTK_CHECK_VERSION (3, 16, 0)
 display = gtk_widget_get_display (GTK_WIDGET (obj));
 obj->priv->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
-#else
- obj->priv->hand_cursor = gdk_cursor_new(GDK_HAND2);
-#endif
 } else if (click_policy == PLUMA_FILE_BROWSER_VIEW_CLICK_POLICY_DOUBLE) {
 if (obj->priv->hover_path != NULL) {
 if (gtk_tree_model_get_iter (GTK_TREE_MODEL (obj->priv->model),
@@ -344,11 +332,7 @@ set_click_policy_property (PlumaFileBrowserView *obj,
 }
 
 if (obj->priv->hand_cursor) {
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (obj->priv->hand_cursor);
-#else
- gdk_cursor_unref (obj->priv->hand_cursor);
-#endif
 obj->priv->hand_cursor = NULL;
 }
 }
@@ -962,9 +946,8 @@ cell_data_cb (GtkTreeViewColumn * tree_column, GtkCellRenderer * cell,
 static void
 pluma_file_browser_view_init (PlumaFileBrowserView * obj)
 {
-#if GTK_CHECK_VERSION (3, 16, 0)
 GdkDisplay *display;
-#endif
+
 obj->priv = PLUMA_FILE_BROWSER_VIEW_GET_PRIVATE (obj);
 
 obj->priv->column = gtk_tree_view_column_new ();
@@ -999,12 +982,8 @@ pluma_file_browser_view_init (PlumaFileBrowserView * obj)
 G_N_ELEMENTS (drag_source_targets),
 GDK_ACTION_COPY);
 
-#if GTK_CHECK_VERSION (3, 16, 0)
 display = gtk_widget_get_display (GTK_WIDGET (obj));
 obj->priv->busy_cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-#else
- obj->priv->busy_cursor = gdk_cursor_new (GDK_WATCH);
-#endif
 }
 
 static gboolean
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index 7cef34cc..535ecbc4 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -50,10 +50,6 @@
 #define XML_UI_FILE "pluma-file-browser-widget-ui.xml"
 #define LOCATION_DATA_KEY "pluma-file-browser-widget-location"
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
-#endif
-
 enum 
 {
 BOOKMARKS_ID,
@@ -240,13 +236,8 @@ static void on_action_filter_binary (GtkAction * action,
 static void on_action_bookmark_open (GtkAction * action,
 PlumaFileBrowserWidget * obj);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 PLUMA_PLUGIN_DEFINE_TYPE (PlumaFileBrowserWidget, pluma_file_browser_widget,
 GTK_TYPE_BOX)
-#else
-PLUMA_PLUGIN_DEFINE_TYPE (PlumaFileBrowserWidget, pluma_file_browser_widget,
- GTK_TYPE_VBOX)
-#endif
 
 static void
 free_name_icon (gpointer data)
@@ -369,11 +360,7 @@ pluma_file_browser_widget_finalize (GObject * object)
 
 cancel_async_operation (obj);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (obj->priv->busy_cursor);
-#else
- gdk_cursor_unref (obj->priv->busy_cursor);
-#endif
 
 G_OBJECT_CLASS (pluma_file_browser_widget_parent_class)->finalize (object);
 }
@@ -1237,7 +1224,7 @@ create_filter (PlumaFileBrowserWidget * obj)
 gtk_widget_show (expander);
 gtk_box_pack_start (GTK_BOX (obj), expander, FALSE, FALSE, 0);
 
- vbox = gtk_vbox_new (FALSE, 3);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
 gtk_widget_show (vbox);
 
 obj->priv->filter_expander = expander;
@@ -1261,9 +1248,8 @@ create_filter (PlumaFileBrowserWidget * obj)
 static void
 pluma_file_browser_widget_init (PlumaFileBrowserWidget * obj)
 {
-#if GTK_CHECK_VERSION (3, 16, 0)
 GdkDisplay *display;
-#endif
+
 obj->priv = PLUMA_FILE_BROWSER_WIDGET_GET_PRIVATE (obj);
 
 obj->priv->bookmarks_hash = g_hash_table_new_full (g_file_hash,
@@ -1272,17 +1258,11 @@ pluma_file_browser_widget_init (PlumaFileBrowserWidget * obj)
 free_name_icon);
 
 gtk_box_set_spacing (GTK_BOX (obj), 3);
-#if GTK_CHECK_VERSION (3, 0, 0)
 gtk_orientable_set_orientation (GTK_ORIENTABLE (obj),
 GTK_ORIENTATION_VERTICAL);
-#endif
 
-#if GTK_CHECK_VERSION (3, 16, 0)
 display = gtk_widget_get_display (GTK_WIDGET (obj));
 obj->priv->busy_cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-#else
- obj->priv->busy_cursor = gdk_cursor_new (GDK_WATCH);
-#endif
 }
 
 /* Private */
@@ -2122,23 +2102,13 @@ set_busy (PlumaFileBrowserWidget *obj, gboolean busy)
 
 if (busy)
 {
-#if GTK_CHECK_VERSION (3, 16, 0)
 GdkDisplay *display;
 GdkCursor *cursor;
 
 display = gtk_widget_get_display (GTK_WIDGET (obj));
 cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-#else
- GdkCursor *cursor;
-
- cursor = gdk_cursor_new (GDK_WATCH);
-#endif
 gdk_window_set_cursor (window, cursor);
-#if GTK_CHECK_VERSION (3, 0, 0)
 g_object_unref (obj->priv->busy_cursor);
-#else
- gdk_cursor_unref (cursor);
-#endif
 }
 else
 {
diff --git a/plugins/filebrowser/pluma-file-browser-widget.h b/plugins/filebrowser/pluma-file-browser-widget.h
index d7be9e4d..47b0d74e 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.h
+++ b/plugins/filebrowser/pluma-file-browser-widget.h
@@ -48,22 +48,14 @@ gboolean (*PlumaFileBrowserWidgetFilterFunc) (PlumaFileBrowserWidget * obj,
 
 struct _PlumaFileBrowserWidget 
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
 GtkBox parent;
-#else
- GtkVBox parent;
-#endif
 
 PlumaFileBrowserWidgetPrivate *priv;
 };
 
 struct _PlumaFileBrowserWidgetClass 
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
 GtkBoxClass parent_class;
-#else
- GtkVBoxClass parent_class;
-#endif
 
 /* Signals */
 void (*uri_activated) (PlumaFileBrowserWidget * widget,
diff --git a/plugins/modelines/modeline-parser.c b/plugins/modelines/modeline-parser.c
index c1d96140..f816f957 100644
--- a/plugins/modelines/modeline-parser.c
+++ b/plugins/modelines/modeline-parser.c
@@ -23,9 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gtksourceview/gtksource.h>
-#endif
 #include <pluma/pluma-language-manager.h>
 #include <pluma/pluma-prefs-manager.h>
 #include <pluma/pluma-debug.h>
diff --git a/plugins/modelines/modeline-parser.h b/plugins/modelines/modeline-parser.h
index ab8eaa34..72a1071f 100644
--- a/plugins/modelines/modeline-parser.h
+++ b/plugins/modelines/modeline-parser.h
@@ -23,7 +23,7 @@
 #define __MODELINE_PARSER_H__
 
 #include <glib.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/spell/pluma-spell-utils.c b/plugins/spell/pluma-spell-utils.c
index 504cf042..24a211c8 100644
--- a/plugins/spell/pluma-spell-utils.c
+++ b/plugins/spell/pluma-spell-utils.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "pluma-spell-utils.h"
-#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksource.h>
 
 gboolean
 pluma_spell_utils_is_digit (const char *text, gssize length)
diff --git a/plugins/taglist/pluma-taglist-plugin-panel.c b/plugins/taglist/pluma-taglist-plugin-panel.c
index 3a8bdae8..8e5fd458 100644
--- a/plugins/taglist/pluma-taglist-plugin-panel.c
+++ b/plugins/taglist/pluma-taglist-plugin-panel.c
@@ -69,11 +69,7 @@ struct _PlumaTaglistPluginPanelPrivate
 gchar *data_dir;
 };
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 PLUMA_PLUGIN_DEFINE_TYPE (PlumaTaglistPluginPanel, pluma_taglist_plugin_panel, GTK_TYPE_BOX)
-#else
-PLUMA_PLUGIN_DEFINE_TYPE (PlumaTaglistPluginPanel, pluma_taglist_plugin_panel, GTK_TYPE_VBOX)
-#endif
 
 enum
 {
@@ -581,14 +577,9 @@ tags_list_query_tooltip_cb (GtkWidget *widget,
 }
 
 static gboolean
-#if GTK_CHECK_VERSION (3, 0, 0)
 draw_event_cb (GtkWidget *panel,
 cairo_t *cr,
-#else
-expose_event_cb (GtkWidget *panel,
- GdkEventExpose *event,
-#endif
- gpointer user_data)
+ gpointer user_data)
 {
 PlumaTaglistPluginPanel *ppanel = PLUMA_TAGLIST_PLUGIN_PANEL (panel);
 
@@ -601,13 +592,8 @@ expose_event_cb (GtkWidget *panel,
 /* And populate combo box */
 populate_tag_groups_combo (PLUMA_TAGLIST_PLUGIN_PANEL (panel));
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 /* We need to manage only the first draw -> disconnect */
 g_signal_handlers_disconnect_by_func (panel, draw_event_cb, NULL);
-#else
- /* We need to manage only the first expose event -> disconnect */
- g_signal_handlers_disconnect_by_func (panel, expose_event_cb, NULL);
-#endif
 
 return FALSE;
 }
@@ -645,17 +631,12 @@ add_preview_widget (PlumaTaglistPluginPanel *panel)
 
 gtk_label_set_line_wrap (GTK_LABEL (panel->priv->preview), TRUE);
 gtk_label_set_use_markup (GTK_LABEL (panel->priv->preview), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
 gtk_widget_set_halign (panel->priv->preview, GTK_ALIGN_START);
 gtk_widget_set_valign (panel->priv->preview, GTK_ALIGN_START);
 gtk_widget_set_margin_start (panel->priv->preview, 6);
 gtk_widget_set_margin_end (panel->priv->preview, 6);
 gtk_widget_set_margin_top (panel->priv->preview, 6);
 gtk_widget_set_margin_bottom (panel->priv->preview, 6);
-#else
- gtk_misc_set_alignment (GTK_MISC (panel->priv->preview), 0, 0);
- gtk_misc_set_padding (GTK_MISC (panel->priv->preview), 6, 6);
-#endif
 gtk_label_set_selectable (GTK_LABEL (panel->priv->preview), TRUE);
 gtk_label_set_selectable (GTK_LABEL (panel->priv->preview), TRUE);
 gtk_label_set_ellipsize (GTK_LABEL (panel->priv->preview),
@@ -688,10 +669,8 @@ pluma_taglist_plugin_panel_init (PlumaTaglistPluginPanel *panel)
 panel->priv = PLUMA_TAGLIST_PLUGIN_PANEL_GET_PRIVATE (panel);
 panel->priv->data_dir = NULL;
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 gtk_orientable_set_orientation (GTK_ORIENTABLE (panel),
 GTK_ORIENTATION_VERTICAL);
-#endif
 
 /* Build the window content */
 panel->priv->tag_groups_combo = gtk_combo_box_text_new ();
@@ -731,9 +710,6 @@ pluma_taglist_plugin_panel_init (PlumaTaglistPluginPanel *panel)
 panel->priv->tag_groups_combo,
 ATK_RELATION_CONTROLLED_BY);
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (panel->priv->tags_list), FALSE);
-#endif
 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (panel->priv->tags_list), FALSE);
 
 g_object_set (panel->priv->tags_list, "has-tooltip", TRUE, NULL);
@@ -786,13 +762,8 @@ pluma_taglist_plugin_panel_init (PlumaTaglistPluginPanel *panel)
 G_CALLBACK (selected_group_changed),
 panel);
 g_signal_connect (panel,
-#if GTK_CHECK_VERSION (3, 0, 0)
 "draw",
 G_CALLBACK (draw_event_cb),
-#else
- "expose-event",
- G_CALLBACK (expose_event_cb),
-#endif
 NULL);
 }
 
diff --git a/plugins/taglist/pluma-taglist-plugin-panel.h b/plugins/taglist/pluma-taglist-plugin-panel.h
index 03738835..ab001b17 100644
--- a/plugins/taglist/pluma-taglist-plugin-panel.h
+++ b/plugins/taglist/pluma-taglist-plugin-panel.h
@@ -58,11 +58,7 @@ typedef struct _PlumaTaglistPluginPanel PlumaTaglistPluginPanel;
 
 struct _PlumaTaglistPluginPanel 
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
 GtkBox vbox;
-#else
- GtkVBox vbox;
-#endif
 
 /*< private > */
 PlumaTaglistPluginPanelPrivate *priv;
@@ -75,11 +71,7 @@ typedef struct _PlumaTaglistPluginPanelClass PlumaTaglistPluginPanelClass;
 
 struct _PlumaTaglistPluginPanelClass 
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
 GtkBoxClass parent_class;
-#else
- GtkVBoxClass parent_class;
-#endif
 };
 
 /*
author	monsta <[email protected]>	2016-11-06 14:43:26 +0300
committer	monsta <[email protected]>	2016-11-06 14:43:26 +0300
commit	4c06cb5cd0859067769dac1317682d430b18cc78 (patch)
tree	0c363ee71311366fb2016df9858858ef5ef2d25d /plugins
parent	65371f53dbb06180b750dad7c19e7bcf0f8651d6 (diff)
download	pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.bz2 pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.xz