summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/docinfo/pluma-docinfo-plugin.c12
-rwxr-xr-xplugins/sort/pluma-sort-plugin.c9
-rwxr-xr-xplugins/spell/pluma-spell-checker-dialog.c12
-rwxr-xr-xplugins/time/pluma-time-plugin.c14
4 files changed, 2 insertions, 45 deletions
diff --git a/plugins/docinfo/pluma-docinfo-plugin.c b/plugins/docinfo/pluma-docinfo-plugin.c
index 1cfe0238..520274bb 100755
--- a/plugins/docinfo/pluma-docinfo-plugin.c
+++ b/plugins/docinfo/pluma-docinfo-plugin.c
@@ -72,11 +72,7 @@ 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
+docinfo_dialog_destroy_cb (GObject *obj,
WindowData *data)
{
pluma_debug (DEBUG_PLUGINS);
@@ -146,14 +142,10 @@ 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",
G_CALLBACK (docinfo_dialog_response_cb),
diff --git a/plugins/sort/pluma-sort-plugin.c b/plugins/sort/pluma-sort-plugin.c
index c4389ec0..a2dfc97c 100755
--- a/plugins/sort/pluma-sort-plugin.c
+++ b/plugins/sort/pluma-sort-plugin.c
@@ -92,11 +92,7 @@ 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);
@@ -198,13 +194,8 @@ 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/pluma-spell-checker-dialog.c b/plugins/spell/pluma-spell-checker-dialog.c
index 5a253252..b41feaf7 100755
--- a/plugins/spell/pluma-spell-checker-dialog.c
+++ b/plugins/spell/pluma-spell-checker-dialog.c
@@ -109,11 +109,7 @@ 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);
@@ -129,11 +125,7 @@ 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
@@ -143,11 +135,7 @@ 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",
diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c
index 006d441c..9a32d2a5 100755
--- a/plugins/time/pluma-time-plugin.c
+++ b/plugins/time/pluma-time-plugin.c
@@ -450,11 +450,7 @@ 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);
@@ -833,13 +829,8 @@ 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",
@@ -1000,13 +991,8 @@ 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",