20 files changed, 100 insertions, 15 deletions
diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am
index 3886dc86..6b3a1cdd 100644
--- a/plugins/changecase/Makefile.am
+++ b/plugins/changecase/Makefile.am
@@ -1,7 +1,7 @@
 # changecase plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
index 471f8b04..fe565398 100644
--- a/plugins/checkupdate/Makefile.am
+++ b/plugins/checkupdate/Makefile.am
@@ -2,7 +2,7 @@
 
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(LIBSOUP_CFLAGS) \
diff --git a/plugins/checkupdate/pluma-check-update-plugin.c b/plugins/checkupdate/pluma-check-update-plugin.c
index 2f8bd1af..b28991af 100644
--- a/plugins/checkupdate/pluma-check-update-plugin.c
+++ b/plugins/checkupdate/pluma-check-update-plugin.c
@@ -43,10 +43,10 @@
 #define VERSION_PLACE "<a href=\"[0-9]\\.[0-9]+/\">"
 
 #ifdef G_OS_WIN32
-#define PLUMA_URL "http://pub.mate-desktop.org/sources/mate-text-editor/"
+#define PLUMA_URL "http://pub.mate-desktop.org/sources/pluma/"
 #define FILE_REGEX "pluma\\-setup\\-[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9]+)?\\.exe"
 #else
-#define PLUMA_URL "http://pub.mate-desktop.org/sources/mate-text-editor/"
+#define PLUMA_URL "http://pub.mate-desktop.org/sources/pluma/"
 #define FILE_REGEX "pluma\\-[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9]+)?\\.dmg"
 #endif
 
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index 27290fc7..ec9fc410 100755
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -1,7 +1,7 @@
 # docinfo plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
diff --git a/plugins/docinfo/pluma-docinfo-plugin.c b/plugins/docinfo/pluma-docinfo-plugin.c
index 454a7c6a..1cfe0238 100755
--- a/plugins/docinfo/pluma-docinfo-plugin.c
+++ b/plugins/docinfo/pluma-docinfo-plugin.c
@@ -72,7 +72,11 @@ static void docinfo_dialog_response_cb (GtkDialog *widget,
 PlumaWindow *window);
 
 static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+docinfo_dialog_dispose_cb (GObject *obj,
+#else
 docinfo_dialog_destroy_cb (GtkObject *obj,
+#endif
 WindowData *data)
 {
 pluma_debug (DEBUG_PLUGINS);
@@ -142,8 +146,13 @@ get_docinfo_dialog (PlumaWindow *window,
 GTK_WINDOW (window));
 
 g_signal_connect (dialog->dialog,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ "dispose",
+ G_CALLBACK (docinfo_dialog_dispose_cb),
+#else
 "destroy",
 G_CALLBACK (docinfo_dialog_destroy_cb),
+#endif
 data);
 g_signal_connect (dialog->dialog,
 "response",
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index cb03c183..2124904c 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -2,7 +2,7 @@
 
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
@@ -76,7 +76,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.filebrowser.gschema.xml
 EXTRA_DIST = \
 $(ui_DATA) \
 $(plugin_in_files) \
- $(gsettings_SCHEMAS_in_in) \
+ $(gsettings_SCHEMAS).in.in \
 pluma-file-browser-enum-types.h.template \
 pluma-file-browser-enum-types.c.template \
 pluma-file-browser-enum-register.c.template \
diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c
index bce64c69..69b1e185 100644
--- a/plugins/filebrowser/pluma-file-browser-plugin.c
+++ b/plugins/filebrowser/pluma-file-browser-plugin.c
@@ -306,6 +306,7 @@ on_confirm_trash_changed (GSettings *settings,
 PlumaFileBrowserPluginData *data;
 gboolean enable = FALSE;
 
+ data = (PlumaFileBrowserPluginData *)(user_data);
 enable = g_settings_get_boolean (settings, key);
 
 data->confirm_trash = enable;
diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c
index 6f611105..ba45feff 100644
--- a/plugins/filebrowser/pluma-file-browser-store.c
+++ b/plugins/filebrowser/pluma-file-browser-store.c
@@ -2480,6 +2480,8 @@ set_virtual_root_from_node (PlumaFileBrowserStore * model,
 GSList *copy;
 GtkTreePath *empty = NULL;
 
+ g_assert (node != NULL);
+
 prev = node;
 next = prev->parent;
 
diff --git a/plugins/filebrowser/pluma-file-browser-utils.c b/plugins/filebrowser/pluma-file-browser-utils.c
index b8274907..86c64053 100644
--- a/plugins/filebrowser/pluma-file-browser-utils.c
+++ b/plugins/filebrowser/pluma-file-browser-utils.c
@@ -169,8 +169,12 @@ pluma_file_browser_utils_confirmation_dialog (PlumaWindow * window,
 /* Add a cancel button */
 button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
 gtk_widget_show (button);
- 
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_can_default (button, TRUE);
+#else
 GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+#endif
 gtk_dialog_add_action_widget (GTK_DIALOG (dlg),
 button,
 GTK_RESPONSE_CANCEL);
@@ -184,7 +188,11 @@ pluma_file_browser_utils_confirmation_dialog (PlumaWindow * window,
 }
 
 gtk_widget_show (button);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_can_default (button, TRUE);
+#else
 GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+#endif
 gtk_dialog_add_action_widget (GTK_DIALOG (dlg),
 button,
 GTK_RESPONSE_OK);
diff --git a/plugins/filebrowser/pluma-file-browser-view.c b/plugins/filebrowser/pluma-file-browser-view.c
index e2488415..6092248c 100644
--- a/plugins/filebrowser/pluma-file-browser-view.c
+++ b/plugins/filebrowser/pluma-file-browser-view.c
@@ -22,7 +22,11 @@
 #include <string.h>
 #include <gio/gio.h>
 #include <pluma/pluma-plugin.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include "pluma-file-browser-store.h"
 #include "pluma-file-bookmarks-store.h"
@@ -319,7 +323,7 @@ set_click_policy_property (PlumaFileBrowserView *obj,
 obj->priv->hover_path = NULL;
 }
 
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (obj))) {
+ if (gtk_widget_get_realized (GTK_WIDGET (obj))) {
 win = gtk_widget_get_window (GTK_WIDGET (obj));
 gdk_window_set_cursor (win, NULL);
 
@@ -638,7 +642,11 @@ key_press_event (GtkWidget *widget,
 handled = FALSE;
 break;
 }
+#if GTK_CHECK_VERSION (3, 0, 0)
+ if (!gtk_widget_has_focus (widget)) {
+#else
 if (!GTK_WIDGET_HAS_FOCUS (widget)) {
+#endif
 handled = FALSE;
 break;
 }
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index f2c54fe9..6e6be102 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -28,7 +28,11 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif
 #include <pluma/pluma-utils.h>
 #include <pluma/pluma-plugin.h>
 
@@ -993,7 +997,11 @@ 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 */
@@ -1014,7 +1022,11 @@ 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);
@@ -1640,6 +1652,8 @@ jump_to_location (PlumaFileBrowserWidget * obj, GList * item,
 
 obj->priv->changing_location = TRUE;
 
+ g_assert (obj->priv->current_location != NULL);
+
 loc = (Location *) (obj->priv->current_location->data);
 
 /* Set the new root + virtual root */
diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am
index d1b59b85..e375c898 100644
--- a/plugins/modelines/Makefile.am
+++ b/plugins/modelines/Makefile.am
@@ -1,7 +1,7 @@
 # Modelines Plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index 52274688..749be6bc 100755
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -1,7 +1,7 @@
 # sort plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
diff --git a/plugins/sort/pluma-sort-plugin.c b/plugins/sort/pluma-sort-plugin.c
index 83ffc18b..c4389ec0 100755
--- a/plugins/sort/pluma-sort-plugin.c
+++ b/plugins/sort/pluma-sort-plugin.c
@@ -92,7 +92,11 @@ static const GtkActionEntry action_entries[] =
 };
 
 static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+sort_dialog_dispose (GObject *obj,
+#else
 sort_dialog_destroy (GtkObject *obj,
+#endif
 gpointer dialog_pointer)
 {
 pluma_debug (DEBUG_PLUGINS);
@@ -194,8 +198,13 @@ get_sort_dialog (ActionData *action_data)
 GTK_RESPONSE_OK);
 
 g_signal_connect (dialog->dialog,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ "dispose",
+ G_CALLBACK (sort_dialog_dispose),
+#else
 "destroy",
 G_CALLBACK (sort_dialog_destroy),
+#endif
 dialog);
 
 g_signal_connect (dialog->dialog,
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 24299165..7c08bf99 100755
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -1,7 +1,7 @@
 # Spell checker plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(ENCHANT_CFLAGS) \
diff --git a/plugins/spell/pluma-spell-checker-dialog.c b/plugins/spell/pluma-spell-checker-dialog.c
index c2c4e275..5a253252 100755
--- a/plugins/spell/pluma-spell-checker-dialog.c
+++ b/plugins/spell/pluma-spell-checker-dialog.c
@@ -109,7 +109,11 @@ static guint signals [LAST_SIGNAL] = { 0 };
 G_DEFINE_TYPE(PlumaSpellCheckerDialog, pluma_spell_checker_dialog, GTK_TYPE_WINDOW)
 
 static void
+#if GTK_CHECK_VERSION (3, 0,0)
+pluma_spell_checker_dialog_dispose (GObject *object)
+#else
 pluma_spell_checker_dialog_destroy (GtkObject *object)
+#endif
 {
 PlumaSpellCheckerDialog *dlg = PLUMA_SPELL_CHECKER_DIALOG (object);
 
@@ -125,7 +129,11 @@ pluma_spell_checker_dialog_destroy (GtkObject *object)
 dlg->misspelled_word = NULL;
 }
 
+#if GTK_CHECK_VERSION (3, 0,0)
+ G_OBJECT_CLASS (pluma_spell_checker_dialog_parent_class)->dispose (object);
+#else
 GTK_OBJECT_CLASS (pluma_spell_checker_dialog_parent_class)->destroy (object);
+#endif
 }
 
 static void
@@ -135,7 +143,11 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
 
 object_class = G_OBJECT_CLASS (klass);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ object_class->dispose = pluma_spell_checker_dialog_dispose;
+#else
 GTK_OBJECT_CLASS (object_class)->destroy = pluma_spell_checker_dialog_destroy;
+#endif
 
 signals[IGNORE] = 
 g_signal_new ("ignore",
@@ -291,7 +303,11 @@ create_dialog (PlumaSpellCheckerDialog *dlg,
 gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 
 /* Set default button */
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_can_default (dlg->change_button, TRUE);
+#else
 GTK_WIDGET_SET_FLAGS (dlg->change_button, GTK_CAN_DEFAULT);
+#endif
 gtk_widget_grab_default (dlg->change_button);
 
 gtk_entry_set_activates_default (GTK_ENTRY (dlg->word_entry), TRUE);
diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am
index dd3306f0..fcc18345 100755
--- a/plugins/taglist/Makefile.am
+++ b/plugins/taglist/Makefile.am
@@ -11,7 +11,7 @@ taglist_in_files = \
 
 taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
diff --git a/plugins/taglist/pluma-taglist-plugin-panel.c b/plugins/taglist/pluma-taglist-plugin-panel.c
index 367b8f04..4ed043da 100755
--- a/plugins/taglist/pluma-taglist-plugin-panel.c
+++ b/plugins/taglist/pluma-taglist-plugin-panel.c
@@ -41,7 +41,11 @@
 #include <pluma/pluma-debug.h>
 #include <pluma/pluma-plugin.h>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif
 #include <glib/gi18n.h>
 
 #define PLUMA_TAGLIST_PLUGIN_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 398e84b4..0c270b8a 100755
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -1,7 +1,7 @@
 # time plugin
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(PLUMA_CFLAGS) \
 $(WARN_CFLAGS) \
@@ -34,7 +34,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml
 %.gschema.xml.in: %.gschema.xml.in.in Makefile
 $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS_in_in)
+EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in
 
 CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn)
 DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c
index 36a96352..a1b8e354 100755
--- a/plugins/time/pluma-time-plugin.c
+++ b/plugins/time/pluma-time-plugin.c
@@ -450,7 +450,11 @@ get_time (const gchar* format)
 }
 
 static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+dialog_disposed (GObject *obj, gpointer dialog_pointer)
+#else
 dialog_destroyed (GtkObject *obj, gpointer dialog_pointer)
+#endif
 {
 pluma_debug (DEBUG_PLUGINS);
 
@@ -830,8 +834,13 @@ get_configure_dialog (PlumaTimePlugin *plugin)
 G_CALLBACK (configure_dialog_button_toggled),
 dialog);
 g_signal_connect (dialog->dialog,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ "dispose",
+ G_CALLBACK (dialog_disposed),
+#else
 "destroy",
 G_CALLBACK (dialog_destroyed),
+#endif
 dialog);
 g_signal_connect (dialog->custom_entry,
 "changed",
@@ -993,8 +1002,13 @@ get_choose_format_dialog (GtkWindow *parent,
 G_CALLBACK (choose_format_dialog_button_toggled),
 dialog);
 g_signal_connect (dialog->dialog,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ "dispose",
+ G_CALLBACK (dialog_disposed),
+#else
 "destroy",
 G_CALLBACK (dialog_destroyed),
+#endif
 dialog);
 g_signal_connect (dialog->custom_entry,
 "changed",