drop support for win32/osx and checkupdate plugin

that plugin has never been built in linux anyway due to logic in configure.ac
author: monsta <[email protected]> 2015-08-25 14:40:58 +0300
committer: infirit <[email protected]> 2015-09-02 11:34:01 +0200
commit: b24934e186456b50d7702192ec3a270926831791 (patch)
tree: e7daae0af65482e5f1a5598808e4e55792dd7e6d /plugins
parent: f6d7a422f3f5f97e676cd18cef5bb46aca8da6be (diff)
download: pluma-b24934e186456b50d7702192ec3a270926831791.tar.bz2
pluma-b24934e186456b50d7702192ec3a270926831791.tar.xz
13 files changed, 33 insertions, 899 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ba80e090..c31e071d 100755
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,5 @@
 DIST_SUBDIRS = \
 changecase \
- checkupdate \
 docinfo \
 externaltools \
 filebrowser \
@@ -16,6 +15,7 @@ DIST_SUBDIRS = \
 SUBDIRS = \
 changecase \
 docinfo \
+ externaltools \
 filebrowser \
 modelines \
 sort \
@@ -24,19 +24,10 @@ SUBDIRS = \
 
 if ENABLE_PYTHON
 SUBDIRS += pythonconsole snippets quickopen
-
-if !OS_WIN32
-SUBDIRS += externaltools
-endif
-
 endif
 
 if ENABLE_ENCHANT
 SUBDIRS += spell
 endif
 
-if ENABLE_UPDATER
-SUBDIRS += checkupdate
-endif
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
deleted file mode 100644
index 38fd5bbc..00000000
--- a/plugins/checkupdate/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# pluma win32 updater
-
-plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- $(PLUMA_CFLAGS) \
- $(LIBSOUP_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-plugin_LTLIBRARIES = libcheckupdate.la
-
-libcheckupdate_la_SOURCES = \
- pluma-check-update-plugin.h \
- pluma-check-update-plugin.c
-
-libcheckupdate_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libcheckupdate_la_LIBADD = $(PLUMA_LIBS) $(LIBSOUP_LIBS)
-
-plugin_in_files = checkupdate.pluma-plugin.desktop.in
-
-%.pluma-plugin: %.pluma-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.pluma.plugins.checkupdate.gschema.xml
-@GSETTINGS_RULES@
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-EXTRA_DIST = $(plugin_in_files) $(gsettings_SCHEMAS).in.in
-
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS)
-
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS)
-
--include $(top_srcdir)/git.mk
diff --git a/plugins/checkupdate/checkupdate.pluma-plugin.desktop.in b/plugins/checkupdate/checkupdate.pluma-plugin.desktop.in
deleted file mode 100644
index 3efec589..00000000
--- a/plugins/checkupdate/checkupdate.pluma-plugin.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Pluma Plugin]
-Module=checkupdate
-IAge=2
-_Name=Check update
-_Description=Check for latest version of pluma
-Icon=pluma-plugin
-Authors=Ignacio Casal Quinteiro <[email protected]>
-Copyright=Copyright © 2009 Ignacio Casal Quinteiro
-Website=http://www.mate-desktop.org
diff --git a/plugins/checkupdate/org.mate.pluma.plugins.checkupdate.gschema.xml.in.in b/plugins/checkupdate/org.mate.pluma.plugins.checkupdate.gschema.xml.in.in
deleted file mode 100644
index d8fab7e1..00000000
--- a/plugins/checkupdate/org.mate.pluma.plugins.checkupdate.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.pluma.plugins.checkupdate" path="/org/mate/pluma/plugins/checkupdate/">
- <key name="ignore-version" type="s">
- <default>''</default>
- <_summary>Version to ignore until the next version is released</_summary>
- </key>
- </schema>
-</schemalist>
diff --git a/plugins/checkupdate/pluma-check-update-plugin.c b/plugins/checkupdate/pluma-check-update-plugin.c
deleted file mode 100644
index 23253f58..00000000
--- a/plugins/checkupdate/pluma-check-update-plugin.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Copyright (C) 2009 - Ignacio Casal Quinteiro <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "pluma-check-update-plugin.h"
-
-#include <glib/gi18n-lib.h>
-#include <pluma/pluma-debug.h>
-#include <pluma/pluma-utils.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
-#include <stdlib.h>
-
-#include <gio/gio.h>
-
-#define SETTINGS_SCHEMA "org.mate.pluma.plugins.checkupdate"
-#define SETTINGS_IGNORE_VERSION "ignore-version"
-
-#define WINDOW_DATA_KEY "PlumaCheckUpdatePluginWindowData"
-
-#define VERSION_PLACE "<a href=\"[0-9]\\.[0-9]+/\">"
-
-#ifdef G_OS_WIN32
-#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/pluma/"
-#define FILE_REGEX "pluma\\-[0-9]+\\.[0-9]+\\.[0-9]+(\\-[0-9]+)?\\.dmg"
-#endif
-
-#ifdef OS_OSX
-#include "pluma/osx/pluma-osx.h"
-#endif
-
-#define PLUMA_CHECK_UPDATE_PLUGIN_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
- PLUMA_TYPE_CHECK_UPDATE_PLUGIN, \
- PlumaCheckUpdatePluginPrivate))
-
-PLUMA_PLUGIN_REGISTER_TYPE (PlumaCheckUpdatePlugin, pluma_check_update_plugin)
-
-struct _PlumaCheckUpdatePluginPrivate
-{
- SoupSession *session;
-
- GSettings *settings;
-};
-
-typedef struct
-{
- PlumaCheckUpdatePlugin *plugin;
-
- gchar *url;
- gchar *version;
-} WindowData;
-
-static void
-free_window_data (gpointer data)
-{
- WindowData *window_data;
-
- if (data == NULL)
- return;
-
- window_data = (WindowData *)data;
-
- g_free (window_data->url);
- g_free (window_data->version);
- g_slice_free (WindowData, data);
-}
-
-static void
-pluma_check_update_plugin_init (PlumaCheckUpdatePlugin *plugin)
-{
- plugin->priv = PLUMA_CHECK_UPDATE_PLUGIN_GET_PRIVATE (plugin);
-
- pluma_debug_message (DEBUG_PLUGINS,
- "PlumaCheckUpdatePlugin initializing");
-
- plugin->priv->session = soup_session_async_new ();
-
- plugin->priv->settings = g_settings_new (SETTINGS_SCHEMA);
-}
-
-static void
-pluma_check_update_plugin_dispose (GObject *object)
-{
- PlumaCheckUpdatePlugin *plugin = PLUMA_CHECK_UPDATE_PLUGIN (object);
-
- if (plugin->priv->session != NULL)
- {
- g_object_unref (plugin->priv->session);
- plugin->priv->session = NULL;
- }
-
- if (plugin->priv->settings != NULL)
- {
- g_object_unref (G_OBJECT (plugin->priv->settings));
-
- plugin->priv->settings = NULL;
- }
-
- pluma_debug_message (DEBUG_PLUGINS,
- "PlumaCheckUpdatePlugin disposing");
-
- G_OBJECT_CLASS (pluma_check_update_plugin_parent_class)->dispose (object);
-}
-
-static void
-pluma_check_update_plugin_finalize (GObject *object)
-{
- pluma_debug_message (DEBUG_PLUGINS,
- "PlumaCheckUpdatePlugin finalizing");
-
- G_OBJECT_CLASS (pluma_check_update_plugin_parent_class)->finalize (object);
-}
-
-static void
-set_contents (GtkWidget *infobar,
- GtkWidget *contents)
-{
- GtkWidget *content_area;
-
- content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
- gtk_container_add (GTK_CONTAINER (content_area), contents);
-}
-
-static void
-set_message_area_text_and_icon (GtkWidget *message_area,
- const gchar *icon_stock_id,
- const gchar *primary_text,
- const gchar *secondary_text)
-{
- GtkWidget *hbox_content;
- GtkWidget *image;
- GtkWidget *vbox;
- gchar *primary_markup;
- gchar *secondary_markup;
- GtkWidget *primary_label;
- GtkWidget *secondary_label;
-
- hbox_content = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox_content);
-
- image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG);
- gtk_widget_show (image);
- gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
-
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (hbox_content), vbox, TRUE, TRUE, 0);
-
- primary_markup = g_strdup_printf ("<b>%s</b>", primary_text);
- primary_label = gtk_label_new (primary_markup);
- g_free (primary_markup);
- gtk_widget_show (primary_label);
- gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
- gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
- gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5);
- gtk_widget_set_can_focus (primary_label, TRUE);
- gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
-
- if (secondary_text != NULL)
- {
- secondary_markup = g_strdup_printf ("<small>%s</small>",
- secondary_text);
- secondary_label = gtk_label_new (secondary_markup);
- g_free (secondary_markup);
- gtk_widget_show (secondary_label);
- gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0);
- gtk_widget_set_can_focus (secondary_label, TRUE);
- gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
- gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5);
- }
-
- set_contents (message_area, hbox_content);
-}
-
-static void
-on_response_cb (GtkWidget *infobar,
- gint response_id,
- PlumaWindow *window)
-{
- if (response_id == GTK_RESPONSE_YES)
- {
- GError *error = NULL;
- WindowData *data;
-
- data = g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
-
-#ifdef OS_OSX
- pluma_osx_show_url (data->url);
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
- data->url,
- GDK_CURRENT_TIME,
- &error);
-#endif
- if (error != NULL)
- {
- GtkWidget *dialog;
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("There was an error displaying the URI."));
-
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- "%s", error->message);
-
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy),
- NULL);
-
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
- gtk_widget_show (dialog);
-
- g_error_free (error);
- }
- }
- else if (response_id == GTK_RESPONSE_NO)
- {
- WindowData *data;
-
- data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-
- g_settings_set_string (data->plugin->priv->settings,
- SETTINGS_IGNORE_VERSION,
- data->version);
- }
-
- g_object_set_data (G_OBJECT (window),
- WINDOW_DATA_KEY,
- NULL);
-
- gtk_widget_destroy (infobar);
-}
-
-static GtkWidget *
-create_infobar (PlumaWindow *window,
- const gchar *version)
-{
- GtkWidget *infobar;
- gchar *message;
-
- GtkWidget *button;
-
- infobar = gtk_info_bar_new ();
-
- button = pluma_gtk_button_new_with_stock_icon (_("_Download"),
- GTK_STOCK_SAVE);
- gtk_widget_show (button);
-
- gtk_info_bar_add_action_widget (GTK_INFO_BAR (infobar),
- button,
- GTK_RESPONSE_YES);
-
- button = pluma_gtk_button_new_with_stock_icon (_("_Ignore Version"),
- GTK_STOCK_DISCARD);
- gtk_widget_show (button);
-
- gtk_info_bar_add_action_widget (GTK_INFO_BAR (infobar),
- button,
- GTK_RESPONSE_NO);
-
- gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
- gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar),
- GTK_MESSAGE_INFO);
-
- message = g_strdup_printf ("%s (%s)", _("There is a new version of pluma"), version);
- set_message_area_text_and_icon (infobar,
- "gtk-dialog-info",
- message,
- _("You can download the new version of pluma"
- " by clicking on the download button or"
- " ignore that version and wait for a new one"));
-
- g_free (message);
-
- g_signal_connect (infobar, "response",
- G_CALLBACK (on_response_cb),
- window);
-
- return infobar;
-}
-
-static void
-pack_infobar (GtkWidget *window,
- GtkWidget *infobar)
-{
- GtkWidget *vbox;
-
- vbox = gtk_bin_get_child (GTK_BIN (window));
-
- gtk_box_pack_start (GTK_BOX (vbox), infobar, FALSE, FALSE, 0);
- gtk_box_reorder_child (GTK_BOX (vbox), infobar, 2);
-}
-
-static gchar *
-get_file (const gchar *text,
- const gchar *regex_place)
-{
- GRegex *regex;
- GMatchInfo *match_info;
- gchar *word = NULL;
-
- regex = g_regex_new (regex_place, 0, 0, NULL);
- g_regex_match (regex, text, 0, &match_info);
- while (g_match_info_matches (match_info))
- {
- g_free (word);
-
- word = g_match_info_fetch (match_info, 0);
-
- g_match_info_next (match_info, NULL);
- }
- g_match_info_free (match_info);
- g_regex_unref (regex);
-
- return word;
-}
-
-static void
-get_numbers (const gchar *version,
- gint *major,
- gint *minor,
- gint *micro)
-{
- gchar **split;
- gint num = 2;
-
- if (micro != NULL)
- num = 3;
-
- split = g_strsplit (version, ".", num);
- *major = atoi (split[0]);
- *minor = atoi (split[1]);
- if (micro != NULL)
- *micro = atoi (split[2]);
-
- g_strfreev (split);
-}
-
-static gboolean
-newer_version (const gchar *v1,
- const gchar *v2,
- gboolean with_micro)
-{
- gboolean newer = FALSE;
- gint major1, minor1, micro1;
- gint major2, minor2, micro2;
-
- if (v1 == NULL || v2 == NULL)
- return FALSE;
-
- if (with_micro)
- {
- get_numbers (v1, &major1, &minor1, &micro1);
- get_numbers (v2, &major2, &minor2, &micro2);
- }
- else
- {
- get_numbers (v1, &major1, &minor1, NULL);
- get_numbers (v2, &major2, &minor2, NULL);
- }
-
- if (major1 > major2)
- {
- newer = TRUE;
- }
- else if (minor1 > minor2 && major1 == major2)
- {
- newer = TRUE;
- }
- else if (with_micro && micro1 > micro2 && minor1 == minor2)
- {
- newer = TRUE;
- }
-
- return newer;
-}
-
-static gchar *
-parse_file_version (const gchar *file)
-{
- gchar *p, *aux;
-
- p = (gchar *)file;
-
- while (*p != '\0' && !g_ascii_isdigit (*p))
- {
- p++;
- }
-
- if (*p == '\0')
- return NULL;
-
- aux = g_strrstr (p, "-");
- if (aux == NULL)
- aux = g_strrstr (p, ".");
-
- return g_strndup (p, aux - p);
-}
-
-static gchar *
-get_ignore_version (PlumaCheckUpdatePlugin *plugin)
-{
- return g_settings_get_string (plugin->priv->settings,
- SETTINGS_IGNORE_VERSION);
-}
-
-static void
-parse_page_file (SoupSession *session,
- SoupMessage *msg,
- PlumaWindow *window)
-{
- if (msg->status_code == SOUP_STATUS_OK)
- {
- gchar *file;
- gchar *file_version;
- gchar *ignore_version;
- WindowData *data;
-
- data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-
- file = get_file (msg->response_body->data, FILE_REGEX);
- file_version = parse_file_version (file);
- ignore_version = get_ignore_version (data->plugin);
-
- if (newer_version (file_version, VERSION, TRUE) &&
- (ignore_version == NULL || *ignore_version == '\0' ||
- newer_version (file_version, ignore_version, TRUE)))
- {
- GtkWidget *infobar;
- WindowData *data;
- gchar *file_url;
-
- data = g_object_get_data (G_OBJECT (window),
- WINDOW_DATA_KEY);
-
- file_url = g_strconcat (data->url, file, NULL);
-
- g_free (data->url);
- data->url = file_url;
- data->version = g_strdup (file_version);
-
- infobar = create_infobar (window, file_version);
- pack_infobar (GTK_WIDGET (window), infobar);
- gtk_widget_show (infobar);
- }
-
- g_free (ignore_version);
- g_free (file_version);
- g_free (file);
- }
- else
- {
- g_object_set_data (G_OBJECT (window),
- WINDOW_DATA_KEY,
- NULL);
- }
-}
-
-static gboolean
-is_unstable (const gchar *version)
-{
- gchar **split;
- gint minor;
- gboolean unstable = TRUE;;
-
- split = g_strsplit (version, ".", 2);
- minor = atoi (split[1]);
- g_strfreev (split);
-
- if ((minor % 2) == 0)
- unstable = FALSE;
-
- return unstable;
-}
-
-static gchar *
-get_file_page_version (const gchar *text,
- const gchar *regex_place)
-{
- GRegex *regex;
- GMatchInfo *match_info;
- GString *string = NULL;
- gchar *unstable = NULL;
- gchar *stable = NULL;
-
- regex = g_regex_new (regex_place, 0, 0, NULL);
- g_regex_match (regex, text, 0, &match_info);
- while (g_match_info_matches (match_info))
- {
- gint end;
- gint i;
-
- g_match_info_fetch_pos (match_info, 0, NULL, &end);
-
- string = g_string_new ("");
-
- i = end;
- while (text[i] != '/')
- {
- string = g_string_append_c (string, text[i]);
- i++;
- }
-
- if (is_unstable (string->str))
- {
- g_free (unstable);
- unstable = g_string_free (string, FALSE);
- }
- else
- {
- g_free (stable);
- stable = g_string_free (string, FALSE);
- }
-
- g_match_info_next (match_info, NULL);
- }
- g_match_info_free (match_info);
- g_regex_unref (regex);
-
- if ((PLUMA_MINOR_VERSION % 2) == 0)
- {
- g_free (unstable);
-
- return stable;
- }
- else
- {
- /* We need to check that stable isn't newer than unstable */
- if (newer_version (stable, unstable, FALSE))
- {
- g_free (unstable);
-
- return stable;
- }
- else
- {
- g_free (stable);
-
- return unstable;
- }
- }
-}
-
-static void
-parse_page_version (SoupSession *session,
- SoupMessage *msg,
- PlumaWindow *window)
-{
- if (msg->status_code == SOUP_STATUS_OK)
- {
- gchar *version;
- SoupMessage *msg2;
- WindowData *data;
-
- data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
-
- version = get_file_page_version (msg->response_body->data,
- VERSION_PLACE);
-
- data->url = g_strconcat (PLUMA_URL, version, "/", NULL);
- g_free (version);
- msg2 = soup_message_new ("GET", data->url);
-
- soup_session_queue_message (session, msg2,
- (SoupSessionCallback)parse_page_file,
- window);
- }
- else
- {
- g_object_set_data (G_OBJECT (window),
- WINDOW_DATA_KEY,
- NULL);
- }
-}
-
-static void
-impl_activate (PlumaPlugin *plugin,
- PlumaWindow *window)
-{
- SoupMessage *msg;
- WindowData *data;
-
- pluma_debug (DEBUG_PLUGINS);
-
- data = g_slice_new (WindowData);
- data->plugin = PLUMA_CHECK_UPDATE_PLUGIN (plugin);
- data->url = NULL;
- data->version = NULL;
-
- g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data,
- free_window_data);
-
- msg = soup_message_new ("GET", PLUMA_URL);
-
- soup_session_queue_message (PLUMA_CHECK_UPDATE_PLUGIN (plugin)->priv->session, msg,
- (SoupSessionCallback)parse_page_version,
- window);
-}
-
-static void
-impl_deactivate (PlumaPlugin *plugin,
- PlumaWindow *window)
-{
-
- pluma_debug (DEBUG_PLUGINS);
-
- soup_session_abort (PLUMA_CHECK_UPDATE_PLUGIN (plugin)->priv->session);
-
- g_object_set_data (G_OBJECT (window),
- WINDOW_DATA_KEY,
- NULL);
-}
-
-static void
-pluma_check_update_plugin_class_init (PlumaCheckUpdatePluginClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- PlumaPluginClass *plugin_class = PLUMA_PLUGIN_CLASS (klass);
-
- g_type_class_add_private (object_class, sizeof (PlumaCheckUpdatePluginPrivate));
-
- object_class->finalize = pluma_check_update_plugin_finalize;
- object_class->dispose = pluma_check_update_plugin_dispose;
-
- plugin_class->activate = impl_activate;
- plugin_class->deactivate = impl_deactivate;
-}
diff --git a/plugins/checkupdate/pluma-check-update-plugin.h b/plugins/checkupdate/pluma-check-update-plugin.h
deleted file mode 100644
index 03c6ead6..00000000
--- a/plugins/checkupdate/pluma-check-update-plugin.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2009 - Ignacio Casal Quinteiro <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef __PLUMA_CHECK_UPDATE_PLUGIN_H__
-#define __PLUMA_CHECK_UPDATE_PLUGIN_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <pluma/pluma-plugin.h>
-
-G_BEGIN_DECLS
-
-/*
- * Type checking and casting macros
- */
-#define PLUMA_TYPE_CHECK_UPDATE_PLUGIN (pluma_check_update_plugin_get_type ())
-#define PLUMA_CHECK_UPDATE_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PLUMA_TYPE_CHECK_UPDATE_PLUGIN, PlumaCheckUpdatePlugin))
-#define PLUMA_CHECK_UPDATE_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PLUMA_TYPE_CHECK_UPDATE_PLUGIN, PlumaCheckUpdatePluginClass))
-#define IS_PLUMA_CHECK_UPDATE_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PLUMA_TYPE_CHECK_UPDATE_PLUGIN))
-#define IS_PLUMA_CHECK_UPDATE_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PLUMA_TYPE_CHECK_UPDATE_PLUGIN))
-#define PLUMA_CHECK_UPDATE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PLUMA_TYPE_CHECK_UPDATE_PLUGIN, PlumaCheckUpdatePluginClass))
-
-/* Private structure type */
-typedef struct _PlumaCheckUpdatePluginPrivate PlumaCheckUpdatePluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _PlumaCheckUpdatePlugin PlumaCheckUpdatePlugin;
-
-struct _PlumaCheckUpdatePlugin
-{
- PlumaPlugin parent_instance;
-
- /*< private >*/
- PlumaCheckUpdatePluginPrivate *priv;
-};
-
-/*
- * Class definition
- */
-typedef struct _PlumaCheckUpdatePluginClass PlumaCheckUpdatePluginClass;
-
-struct _PlumaCheckUpdatePluginClass
-{
- PlumaPluginClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType pluma_check_update_plugin_get_type (void) G_GNUC_CONST;
-
-/* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_pluma_plugin (GTypeModule *module);
-
-G_END_DECLS
-
-#endif /* __PLUMA_CHECK_UPDATE_PLUGIN_H__ */
diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
index b9466cd7..c9abcce0 100755
--- a/plugins/externaltools/data/Makefile.am
+++ b/plugins/externaltools/data/Makefile.am
@@ -2,31 +2,14 @@ TOOL_MERGE=$(top_srcdir)/plugins/externaltools/scripts/pluma-tool-merge.pl
 
 tools_in_files = \
 build.tool.in \
- remove-trailing-spaces.tool.in
-
-tools_in_linux = \
 open-terminal-here.tool.in \
+ remove-trailing-spaces.tool.in \
 run-command.tool.in \
 search-recursive.tool.in \
 switch-c.tool.in
 
-tools_in_osx = \
- open-terminal-here-osx.tool.in
-
-tools_in_win32 =
-
 install_tools_in_files = $(tools_in_files)
 
-if PLATFORM_OSX
-install_tools_in_files += $(tools_in_osx)
-else
-if PLATFORM_WIN32
-install_tools_in_files += $(tools_in_win32)
-else
-install_tools_in_files += $(tools_in_linux)
-endif
-endif
-
 desktop_in_files = $(install_tools_in_files:.tool.in=.desktop.in)
 desktop_files = $(install_tools_in_files:.tool.in=.desktop)
 
@@ -34,10 +17,7 @@ tools_SCRIPTS = $(install_tools_in_files:.tool.in=)
 toolsdir = $(PLUMA_PLUGINS_DATA_DIR)/externaltools/tools
 
 all_tools_in_files = \
- $(tools_in_files) \
- $(tools_in_linux) \
- $(tools_in_osx) \
- $(tools_in_win32)
+ $(tools_in_files)
 
 all_desktop_in_files = $(all_tools_in_files:.tool.in=.desktop.in)
 all_desktop_files = $(all_tools_in_files:.tool.in=.desktop)
@@ -63,5 +43,4 @@ DISTCLEANFILES = \
 $(all_desktop_files) \
 $(all_tools_files)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/externaltools/data/open-terminal-here-osx.desktop.in b/plugins/externaltools/data/open-terminal-here-osx.desktop.in
deleted file mode 100755
index 45587ef6..00000000
--- a/plugins/externaltools/data/open-terminal-here-osx.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Pluma Tool]
-_Name=Open terminal here
-_Comment=Open a terminal in the document location
-Input=nothing
-Output=output-panel
-Applicability=local
-Save-files=nothing
-Languages=
diff --git a/plugins/externaltools/data/open-terminal-here-osx.tool.in b/plugins/externaltools/data/open-terminal-here-osx.tool.in
deleted file mode 100755
index 86d842dc..00000000
--- a/plugins/externaltools/data/open-terminal-here-osx.tool.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/osascript
-
-set the_path to system attribute "PLUMA_CURRENT_DOCUMENT_DIR"
-set cmd to "cd " & quoted form of the_path
-
-tell application "System Events" to set terminalIsRunning to exists application process "Terminal"
-
-tell application "Terminal"
- activate
- 
- if terminalIsRunning is true then
- do script with command cmd
- else
- do script with command cmd in window 1
- end if
-end tell
diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c
index ba45feff..ce83fc74 100644
--- a/plugins/filebrowser/pluma-file-browser-store.c
+++ b/plugins/filebrowser/pluma-file-browser-store.c
@@ -2257,7 +2257,6 @@ model_iterate_next_files_cb (GFileEnumerator * enumerator,
 * FIXME: This is temporarly, it is a bug in gio:
 * http://bugzilla.gnome.org/show_bug.cgi?id=565924
 */
-#ifndef G_OS_WIN32
 if (g_file_is_native (parent->file) && dir->monitor == NULL) {
 dir->monitor = g_file_monitor_directory (parent->file, 
 G_FILE_MONITOR_NONE,
@@ -2271,7 +2270,6 @@ model_iterate_next_files_cb (GFileEnumerator * enumerator,
 parent);
 }
 }
-#endif
 
 model_check_dummy (dir->model, parent);
 model_end_loading (dir->model, parent);
diff --git a/plugins/spell/pluma-spell-plugin.c b/plugins/spell/pluma-spell-plugin.c
index 0cd64b20..6018621c 100755
--- a/plugins/spell/pluma-spell-plugin.c
+++ b/plugins/spell/pluma-spell-plugin.c
@@ -41,14 +41,8 @@
 #include "pluma-spell-language-dialog.h"
 #include "pluma-automatic-spell-checker.h"
 
-#ifdef G_OS_WIN32
-#include <pluma/pluma-metadata-manager.h>
-#define PLUMA_METADATA_ATTRIBUTE_SPELL_LANGUAGE "spell-language"
-#define PLUMA_METADATA_ATTRIBUTE_SPELL_ENABLED "spell-enabled"
-#else
 #define PLUMA_METADATA_ATTRIBUTE_SPELL_LANGUAGE "metadata::pluma-spell-language"
 #define PLUMA_METADATA_ATTRIBUTE_SPELL_ENABLED "metadata::pluma-spell-enabled"
-#endif
 
 #define WINDOW_DATA_KEY "PlumaSpellPluginWindowData"
 #define MENU_PATH "/MenuBar/ToolsMenu/ToolsOps_1"
diff --git a/plugins/taglist/pluma-taglist-plugin-parser.c b/plugins/taglist/pluma-taglist-plugin-parser.c
index 05f50ba5..a67fae5d 100755
--- a/plugins/taglist/pluma-taglist-plugin-parser.c
+++ b/plugins/taglist/pluma-taglist-plugin-parser.c
@@ -31,7 +31,7 @@
 /* FIXME: we should rewrite the parser to avoid using DOM */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h>
+#include <config.h>
 #endif
 
 #include <string.h>
@@ -602,45 +602,38 @@ TagList* create_taglist(const gchar* data_dir)
 return taglist;
 }
 
- #ifndef G_OS_WIN32
- const gchar* home;
- const gchar* envvar;
+ const gchar* home;
+ const gchar* envvar;
 
- /* load user's taglists */
+ /* load user's taglists */
 
- /* legacy dir */
- home = g_get_home_dir ();
- if (home != NULL)
- {
- pdir = g_build_filename (home,
- USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY,
- NULL);
- parse_taglist_dir (pdir);
- g_free (pdir);
- }
-
- /* Support old libmate env var */
- envvar = g_getenv ("MATE22_USER_DIR");
- if (envvar != NULL)
- {
- pdir = g_build_filename (envvar,
- USER_PLUMA_TAGLIST_PLUGIN_LOCATION,
- NULL);
- parse_taglist_dir (pdir);
- g_free (pdir);
- }
- else if (home != NULL)
- {
- pdir = g_build_filename(home, ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL);
- parse_taglist_dir(pdir);
- g_free (pdir);
- }
+ /* legacy dir */
+ home = g_get_home_dir ();
+ if (home != NULL)
+ {
+ pdir = g_build_filename (home,
+ USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY,
+ NULL);
+ parse_taglist_dir (pdir);
+ g_free (pdir);
+ }
 
- #else
- pdir = g_build_filename(g_get_user_config_dir(), "pluma", "taglist", NULL);
+ /* Support old libmate env var */
+ envvar = g_getenv ("MATE22_USER_DIR");
+ if (envvar != NULL)
+ {
+ pdir = g_build_filename (envvar,
+ USER_PLUMA_TAGLIST_PLUGIN_LOCATION,
+ NULL);
+ parse_taglist_dir (pdir);
+ g_free (pdir);
+ }
+ else if (home != NULL)
+ {
+ pdir = g_build_filename(home, ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL);
 parse_taglist_dir(pdir);
- g_free(pdir);
- #endif
+ g_free (pdir);
+ }
 
 /* load system's taglists */
 parse_taglist_dir(data_dir);
diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c
index d3f251ae..1cda2c35 100755
--- a/plugins/time/pluma-time-plugin.c
+++ b/plugins/time/pluma-time-plugin.c
@@ -72,9 +72,7 @@ static const gchar *formats[] =
 "%a %d %b %Y %H:%M:%S",
 "%d/%m/%Y",
 "%d/%m/%y",
-#ifndef G_OS_WIN32
- "%D", /* This one is not supported on win32 */
-#endif
+ "%D",
 "%A %d %B %Y",
 "%A %B %d %Y",
 "%Y-%m-%d",
author	monsta <[email protected]>	2015-08-25 14:40:58 +0300
committer	infirit <[email protected]>	2015-09-02 11:34:01 +0200
commit	b24934e186456b50d7702192ec3a270926831791 (patch)
tree	e7daae0af65482e5f1a5598808e4e55792dd7e6d /plugins
parent	f6d7a422f3f5f97e676cd18cef5bb46aca8da6be (diff)
download	pluma-b24934e186456b50d7702192ec3a270926831791.tar.bz2 pluma-b24934e186456b50d7702192ec3a270926831791.tar.xz