wp/xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Replace GtkObject with Gobject in gtk+2 build

Browse Source
This commit is contained in:
infirit
2014-05-19 14:08:24 +02:00
parent b3097ad42b
commit 53be5f994d
7 changed files with 2 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/docinfo/pluma-docinfo-plugin.c
View File

@@ -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),

9
plugins/sort/pluma-sort-plugin.c
View File

@@ -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,

12
plugins/spell/pluma-spell-checker-dialog.c
View File

@@ -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",

14
plugins/time/pluma-time-plugin.c
View File

@@ -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",