[gedit-plugins] Remove usage of deprecated methods

[Jordi Mas <jmas src gnome org>]

commit 5a71fcee30e4acf852c2d8ea49e3c3b5042776e6
Author: Jordi Mas <jmas softcatala org>
Date:   Sun Apr 28 11:24:16 2019 +0000

    Remove usage of deprecated methods

 .../bookmarks/gedit-bookmarks-app-activatable.c    | 16 ++++++++------
 plugins/bookmarks/gedit-bookmarks-plugin.c         | 23 ++++++++------------
 .../messages/gedit-bookmarks-message-add.c         |  6 +-----
 .../messages/gedit-bookmarks-message-goto-next.c   |  7 ++----
 .../gedit-bookmarks-message-goto-previous.c        |  7 ++----
 .../messages/gedit-bookmarks-message-remove.c      |  8 ++-----
 .../messages/gedit-bookmarks-message-toggle.c      |  5 +----
 .../wordcompletion/gedit-word-completion-plugin.c  | 25 ++++++++++------------
 plugins/zeitgeist/gedit-zeitgeist-plugin.c         |  9 +++-----
 9 files changed, 41 insertions(+), 65 deletions(-)
---
diff --git a/plugins/bookmarks/gedit-bookmarks-app-activatable.c 
b/plugins/bookmarks/gedit-bookmarks-app-activatable.c
index aac6270..0a419c3 100644
--- a/plugins/bookmarks/gedit-bookmarks-app-activatable.c
+++ b/plugins/bookmarks/gedit-bookmarks-app-activatable.c
@@ -132,10 +132,13 @@ gedit_bookmarks_app_activatable_activate (GeditAppActivatable *activatable)
        GeditBookmarksAppActivatable *app_activatable = GEDIT_BOOKMARKS_APP_ACTIVATABLE (activatable);
        GeditBookmarksAppActivatablePrivate *priv = gedit_bookmarks_app_activatable_get_instance_private 
(app_activatable);
        GMenuItem *item;
+       const gchar *toggle_accel[] = {"<Primary><Alt>B", NULL};
+       const gchar *next_others_accel[] = {"<Primary>B", NULL};
+       const gchar *prev_accel[] = {"<Primary><Shift>B", NULL};
 
-       gtk_application_add_accelerator (GTK_APPLICATION (priv->app), "<Primary><Alt>B", 
"win.bookmark-toggle", NULL);
-       gtk_application_add_accelerator (GTK_APPLICATION (priv->app), "<Primary>B", "win.bookmark-next", 
NULL);
-       gtk_application_add_accelerator (GTK_APPLICATION (priv->app), "<Primary><Shift>B", 
"win.bookmark-prev", NULL);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-toggle", 
toggle_accel);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-next", 
next_others_accel);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-prev", prev_accel);
 
        priv->menu_ext = gedit_app_activatable_extend_menu (activatable, "search-section");
        item = g_menu_item_new (_("Toggle Bookmark"), "win.bookmark-toggle");
@@ -156,10 +159,11 @@ gedit_bookmarks_app_activatable_deactivate (GeditAppActivatable *activatable)
 {
        GeditBookmarksAppActivatable *app_activatable = GEDIT_BOOKMARKS_APP_ACTIVATABLE (activatable);
        GeditBookmarksAppActivatablePrivate *priv = gedit_bookmarks_app_activatable_get_instance_private 
(app_activatable);
+       const gchar *accels[] = { NULL };
 
-       gtk_application_remove_accelerator (GTK_APPLICATION (priv->app), "win.bookmark-toggle", NULL);
-       gtk_application_remove_accelerator (GTK_APPLICATION (priv->app), "win.bookmark-next", NULL);
-       gtk_application_remove_accelerator (GTK_APPLICATION (priv->app), "win.bookmark-prev", NULL);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-toggle", accels);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-next", accels);
+       gtk_application_set_accels_for_action (GTK_APPLICATION (priv->app), "win.bookmark-prev", accels);
 
        g_clear_object (&priv->menu_ext);
 }
diff --git a/plugins/bookmarks/gedit-bookmarks-plugin.c b/plugins/bookmarks/gedit-bookmarks-plugin.c
index b2f648b..5b974fe 100644
--- a/plugins/bookmarks/gedit-bookmarks-plugin.c
+++ b/plugins/bookmarks/gedit-bookmarks-plugin.c
@@ -35,11 +35,6 @@
 #include <gedit/gedit-window-activatable.h>
 #include <gedit/gedit-document.h>
 
-#define GEDIT_BOOKMARKS_PLUGIN_GET_PRIVATE(object) \
-                               (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-                               GEDIT_TYPE_BOOKMARKS_PLUGIN,            \
-                               GeditBookmarksPluginPrivate))
-
 #define BOOKMARK_CATEGORY "GeditBookmarksPluginBookmark"
 #define BOOKMARK_PRIORITY 1
 
@@ -104,13 +99,6 @@ static void toggle_bookmark (GtkSourceBuffer *buffer, GtkTextIter *iter);
 
 static void gedit_window_activatable_iface_init (GeditWindowActivatableInterface *iface);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditBookmarksPlugin,
-                               gedit_bookmarks_plugin,
-                               PEAS_TYPE_EXTENSION_BASE,
-                               0,
-                               G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_WINDOW_ACTIVATABLE,
-                                                              gedit_window_activatable_iface_init))
-
 struct _GeditBookmarksPluginPrivate
 {
        GeditWindow *window;
@@ -120,6 +108,14 @@ struct _GeditBookmarksPluginPrivate
        GSimpleAction *action_prev;
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditBookmarksPlugin,
+                               gedit_bookmarks_plugin,
+                               PEAS_TYPE_EXTENSION_BASE,
+                               0,
+                               G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_WINDOW_ACTIVATABLE,
+                                                              gedit_window_activatable_iface_init)
+                               G_ADD_PRIVATE_DYNAMIC (GeditBookmarksPlugin))
+
 enum
 {
        PROP_0,
@@ -131,7 +127,7 @@ gedit_bookmarks_plugin_init (GeditBookmarksPlugin *plugin)
 {
        gedit_debug_message (DEBUG_PLUGINS, "GeditBookmarksPlugin initializing");
 
-       plugin->priv = GEDIT_BOOKMARKS_PLUGIN_GET_PRIVATE (plugin);
+       plugin->priv = gedit_bookmarks_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -844,7 +840,6 @@ gedit_bookmarks_plugin_class_init (GeditBookmarksPluginClass *klass)
 
        g_object_class_override_property (object_class, PROP_WINDOW, "window");
 
-       g_type_class_add_private (klass, sizeof (GeditBookmarksPluginPrivate));
 }
 
 static void
diff --git a/plugins/bookmarks/messages/gedit-bookmarks-message-add.c 
b/plugins/bookmarks/messages/gedit-bookmarks-message-add.c
index cb9eb82..6cf1273 100644
--- a/plugins/bookmarks/messages/gedit-bookmarks-message-add.c
+++ b/plugins/bookmarks/messages/gedit-bookmarks-message-add.c
@@ -24,8 +24,6 @@
 #include <gedit/gedit-view.h>
 #include "gedit-bookmarks-message-add.h"
 
-#define GEDIT_BOOKMARKS_MESSAGE_ADD_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_BOOKMARKS_MESSAGE_ADD, GeditBookmarksMessageAddPrivate))
-
 enum
 {
        PROP_0,
@@ -142,12 +140,10 @@ gedit_bookmarks_message_add_class_init (GeditBookmarksMessageAddClass *klass)
                                                              G_PARAM_READWRITE |
                                                              G_PARAM_CONSTRUCT |
                                                              G_PARAM_STATIC_STRINGS));
-
-       g_type_class_add_private (object_class, sizeof (GeditBookmarksMessageAddPrivate));
 }
 
 static void
 gedit_bookmarks_message_add_init (GeditBookmarksMessageAdd *message)
 {
-       message->priv = GEDIT_BOOKMARKS_MESSAGE_ADD_GET_PRIVATE (message);
+       message->priv = gedit_bookmarks_message_add_get_instance_private (message);
 }
diff --git a/plugins/bookmarks/messages/gedit-bookmarks-message-goto-next.c 
b/plugins/bookmarks/messages/gedit-bookmarks-message-goto-next.c
index 9cb67ec..c9ff662 100644
--- a/plugins/bookmarks/messages/gedit-bookmarks-message-goto-next.c
+++ b/plugins/bookmarks/messages/gedit-bookmarks-message-goto-next.c
@@ -24,8 +24,6 @@
 #include <gedit/gedit-view.h>
 #include "gedit-bookmarks-message-goto-next.h"
 
-#define GEDIT_BOOKMARKS_MESSAGE_GOTO_NEXT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_BOOKMARKS_MESSAGE_GOTO_NEXT, GeditBookmarksMessageGotoNextPrivate))
-
 enum
 {
        PROP_0,
@@ -40,7 +38,7 @@ struct _GeditBookmarksMessageGotoNextPrivate
        GtkTextIter *iter;
 };
 
-G_DEFINE_TYPE (GeditBookmarksMessageGotoNext, gedit_bookmarks_message_goto_next, GEDIT_TYPE_MESSAGE)
+G_DEFINE_TYPE_WITH_PRIVATE (GeditBookmarksMessageGotoNext, gedit_bookmarks_message_goto_next, 
GEDIT_TYPE_MESSAGE)
 
 static void
 gedit_bookmarks_message_goto_next_finalize (GObject *obj)
@@ -143,11 +141,10 @@ gedit_bookmarks_message_goto_next_class_init (GeditBookmarksMessageGotoNextClass
                                                              G_PARAM_CONSTRUCT |
                                                              G_PARAM_STATIC_STRINGS));
 
-       g_type_class_add_private (object_class, sizeof (GeditBookmarksMessageGotoNextPrivate));
 }
 
 static void
 gedit_bookmarks_message_goto_next_init (GeditBookmarksMessageGotoNext *message)
 {
-       message->priv = GEDIT_BOOKMARKS_MESSAGE_GOTO_NEXT_GET_PRIVATE (message);
+       message->priv = gedit_bookmarks_message_goto_next_get_instance_private (message);
 }
diff --git a/plugins/bookmarks/messages/gedit-bookmarks-message-goto-previous.c 
b/plugins/bookmarks/messages/gedit-bookmarks-message-goto-previous.c
index 8ba41cd..f4a7695 100644
--- a/plugins/bookmarks/messages/gedit-bookmarks-message-goto-previous.c
+++ b/plugins/bookmarks/messages/gedit-bookmarks-message-goto-previous.c
@@ -24,8 +24,6 @@
 #include <gedit/gedit-view.h>
 #include "gedit-bookmarks-message-goto-previous.h"
 
-#define GEDIT_BOOKMARKS_MESSAGE_GOTO_PREVIOUS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_BOOKMARKS_MESSAGE_GOTO_PREVIOUS, GeditBookmarksMessageGotoPreviousPrivate))
-
 enum
 {
        PROP_0,
@@ -40,7 +38,7 @@ struct _GeditBookmarksMessageGotoPreviousPrivate
        GtkTextIter *iter;
 };
 
-G_DEFINE_TYPE (GeditBookmarksMessageGotoPrevious, gedit_bookmarks_message_goto_previous, GEDIT_TYPE_MESSAGE)
+G_DEFINE_TYPE_WITH_PRIVATE (GeditBookmarksMessageGotoPrevious, gedit_bookmarks_message_goto_previous, 
GEDIT_TYPE_MESSAGE)
 
 static void
 gedit_bookmarks_message_goto_previous_finalize (GObject *obj)
@@ -143,11 +141,10 @@ gedit_bookmarks_message_goto_previous_class_init (GeditBookmarksMessageGotoPrevi
                                                              G_PARAM_CONSTRUCT |
                                                              G_PARAM_STATIC_STRINGS));
 
-       g_type_class_add_private (object_class, sizeof (GeditBookmarksMessageGotoPreviousPrivate));
 }
 
 static void
 gedit_bookmarks_message_goto_previous_init (GeditBookmarksMessageGotoPrevious *message)
 {
-       message->priv = GEDIT_BOOKMARKS_MESSAGE_GOTO_PREVIOUS_GET_PRIVATE (message);
+       message->priv = gedit_bookmarks_message_goto_previous_get_instance_private (message);
 }
diff --git a/plugins/bookmarks/messages/gedit-bookmarks-message-remove.c 
b/plugins/bookmarks/messages/gedit-bookmarks-message-remove.c
index c4ed0f4..a693177 100644
--- a/plugins/bookmarks/messages/gedit-bookmarks-message-remove.c
+++ b/plugins/bookmarks/messages/gedit-bookmarks-message-remove.c
@@ -24,8 +24,6 @@
 #include <gedit/gedit-view.h>
 #include "gedit-bookmarks-message-remove.h"
 
-#define GEDIT_BOOKMARKS_MESSAGE_REMOVE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_BOOKMARKS_MESSAGE_REMOVE, GeditBookmarksMessageRemovePrivate))
-
 enum
 {
        PROP_0,
@@ -40,7 +38,7 @@ struct _GeditBookmarksMessageRemovePrivate
        GtkTextIter *iter;
 };
 
-G_DEFINE_TYPE (GeditBookmarksMessageRemove, gedit_bookmarks_message_remove, GEDIT_TYPE_MESSAGE)
+G_DEFINE_TYPE_WITH_PRIVATE (GeditBookmarksMessageRemove, gedit_bookmarks_message_remove, GEDIT_TYPE_MESSAGE)
 
 static void
 gedit_bookmarks_message_remove_finalize (GObject *obj)
@@ -142,12 +140,10 @@ gedit_bookmarks_message_remove_class_init (GeditBookmarksMessageRemoveClass *kla
                                                              G_PARAM_READWRITE |
                                                              G_PARAM_CONSTRUCT |
                                                              G_PARAM_STATIC_STRINGS));
-
-       g_type_class_add_private (object_class, sizeof (GeditBookmarksMessageRemovePrivate));
 }
 
 static void
 gedit_bookmarks_message_remove_init (GeditBookmarksMessageRemove *message)
 {
-       message->priv = GEDIT_BOOKMARKS_MESSAGE_REMOVE_GET_PRIVATE (message);
+       message->priv = gedit_bookmarks_message_remove_get_instance_private (message);
 }
diff --git a/plugins/bookmarks/messages/gedit-bookmarks-message-toggle.c 
b/plugins/bookmarks/messages/gedit-bookmarks-message-toggle.c
index 26d1b83..96c2d5b 100644
--- a/plugins/bookmarks/messages/gedit-bookmarks-message-toggle.c
+++ b/plugins/bookmarks/messages/gedit-bookmarks-message-toggle.c
@@ -24,8 +24,6 @@
 #include <gedit/gedit-view.h>
 #include "gedit-bookmarks-message-toggle.h"
 
-#define GEDIT_BOOKMARKS_MESSAGE_TOGGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), 
GEDIT_TYPE_BOOKMARKS_MESSAGE_TOGGLE, GeditBookmarksMessageTogglePrivate))
-
 enum
 {
        PROP_0,
@@ -143,11 +141,10 @@ gedit_bookmarks_message_toggle_class_init (GeditBookmarksMessageToggleClass *kla
                                                              G_PARAM_CONSTRUCT |
                                                              G_PARAM_STATIC_STRINGS));
 
-       g_type_class_add_private (object_class, sizeof (GeditBookmarksMessageTogglePrivate));
 }
 
 static void
 gedit_bookmarks_message_toggle_init (GeditBookmarksMessageToggle *message)
 {
-       message->priv = GEDIT_BOOKMARKS_MESSAGE_TOGGLE_GET_PRIVATE (message);
+       message->priv = gedit_bookmarks_message_toggle_get_instance_private (message);
 }
diff --git a/plugins/wordcompletion/gedit-word-completion-plugin.c 
b/plugins/wordcompletion/gedit-word-completion-plugin.c
index 6bf81ee..2b10a85 100644
--- a/plugins/wordcompletion/gedit-word-completion-plugin.c
+++ b/plugins/wordcompletion/gedit-word-completion-plugin.c
@@ -43,6 +43,14 @@ static void gedit_window_activatable_iface_init (GeditWindowActivatableInterface
 static void gedit_view_activatable_iface_init (GeditViewActivatableInterface *iface);
 static void peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface);
 
+struct _GeditWordCompletionPluginPrivate
+{
+       GtkWidget *window;
+       GeditView *view;
+       GtkSourceCompletionProvider *provider;
+};
+
+
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditWordCompletionPlugin,
                                 gedit_word_completion_plugin,
                                 PEAS_TYPE_EXTENSION_BASE,
@@ -52,14 +60,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditWordCompletionPlugin,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_VIEW_ACTIVATABLE,
                                                                gedit_view_activatable_iface_init)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_GTK_TYPE_CONFIGURABLE,
-                                                               peas_gtk_configurable_iface_init))
-
-struct _GeditWordCompletionPluginPrivate
-{
-       GtkWidget *window;
-       GeditView *view;
-       GtkSourceCompletionProvider *provider;
-};
+                                                               peas_gtk_configurable_iface_init)
+                                                               G_ADD_PRIVATE_DYNAMIC 
(GeditWordCompletionPlugin))
 
 enum
 {
@@ -73,9 +75,7 @@ gedit_word_completion_plugin_init (GeditWordCompletionPlugin *plugin)
 {
        gedit_debug_message (DEBUG_PLUGINS, "GeditWordCompletionPlugin initializing");
 
-       plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                                   GEDIT_TYPE_WORD_COMPLETION_PLUGIN,
-                                                   GeditWordCompletionPluginPrivate);
+       plugin->priv = gedit_word_completion_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -273,7 +273,6 @@ gedit_word_completion_view_deactivate (GeditViewActivatable *activatable)
 {
        GeditWordCompletionPluginPrivate *priv;
        GtkSourceCompletion *completion;
-       GtkSourceCompletionProvider *provider;
        GtkTextBuffer *buf;
 
        gedit_debug (DEBUG_PLUGINS);
@@ -348,8 +347,6 @@ gedit_word_completion_plugin_class_init (GeditWordCompletionPluginClass *klass)
 
        g_object_class_override_property (object_class, PROP_WINDOW, "window");
        g_object_class_override_property (object_class, PROP_VIEW, "view");
-
-       g_type_class_add_private (klass, sizeof (GeditWordCompletionPluginPrivate));
 }
 
 static void
diff --git a/plugins/zeitgeist/gedit-zeitgeist-plugin.c b/plugins/zeitgeist/gedit-zeitgeist-plugin.c
index 65f472f..97fc039 100644
--- a/plugins/zeitgeist/gedit-zeitgeist-plugin.c
+++ b/plugins/zeitgeist/gedit-zeitgeist-plugin.c
@@ -69,7 +69,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditZeitgeistPlugin,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_VIEW_ACTIVATABLE,
                                                                gedit_view_activatable_iface_init)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_APP_ACTIVATABLE,
-                                                               gedit_app_activatable_iface_init))
+                                                               gedit_app_activatable_iface_init)
+                               G_ADD_PRIVATE_DYNAMIC (GeditZeitgeistPlugin))
 
 static ZeitgeistLog *zg_log = NULL;
 static ZeitgeistDataSourceRegistry *zg_dsr = NULL;
@@ -79,9 +80,7 @@ gedit_zeitgeist_plugin_init (GeditZeitgeistPlugin *plugin)
 {
        gedit_debug_message (DEBUG_PLUGINS, "GeditZeitgeistPlugin initializing");
 
-       plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                                   GEDIT_TYPE_ZEITGEIST_PLUGIN,
-                                                   GeditZeitgeistPluginPrivate);
+       plugin->priv = gedit_zeitgeist_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -311,8 +310,6 @@ gedit_zeitgeist_plugin_class_init (GeditZeitgeistPluginClass *klass)
 
        g_object_class_override_property (object_class, PROP_VIEW, "view");
        g_object_class_override_property (object_class, PROP_APP, "app");
-
-       g_type_class_add_private (klass, sizeof (GeditZeitgeistPluginPrivate));
 }
 
 static void