[gtk+] gtkmain: Remove deprecated gtk_init_add() function
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkmain: Remove deprecated gtk_init_add() function
- Date: Tue, 16 Nov 2010 06:07:25 +0000 (UTC)
commit 70d95f04e7e3d7e7738d69aabd1000e75d7fed0d
Author: Javier Jardón <jjardon gnome org>
Date: Wed Oct 13 03:05:22 2010 +0200
gtkmain: Remove deprecated gtk_init_add() function
https://bugzilla.gnome.org/show_bug.cgi?id=629955
docs/reference/gtk/gtk3-sections.txt | 1 -
docs/reference/gtk/tmpl/gtkmain.sgml | 10 ---------
gtk/gtk.symbols | 1 -
gtk/gtkmain.c | 37 ----------------------------------
gtk/gtkmain.h | 2 -
5 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index faf87cd..fe96c81 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -5202,7 +5202,6 @@ gtk_device_grab_remove
<SUBSECTION>
GtkFunction
-gtk_init_add
gtk_quit_add_destroy
gtk_quit_add
GtkCallbackMarshal
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 4c698b6..c49a5d9 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -439,16 +439,6 @@ If @widget does not have the grab, this function does nothing.
@Returns:
-<!-- ##### FUNCTION gtk_init_add ##### -->
-<para>
-Registers a function to be called when the mainloop is started.
-</para>
-
- function: Function to invoke when gtk_main() is called next.
- data: Data to pass to that function.
- Deprecated: This function is going to be removed in GTK+ 3.0
-
-
<!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
<para>
Trigger destruction of @object in case the mainloop at level @main_level
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index cd88fda..d81a8ab 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1878,7 +1878,6 @@ gtk_init
#ifdef G_OS_WIN32
gtk_init_abi_check
#endif
-gtk_init_add
gtk_init_check
#ifdef G_OS_WIN32
gtk_init_check_abi_check
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index a4d067a..1ba0ae7 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -146,16 +146,9 @@ _gtk_get_localedir (void)
/* Private type definitions
*/
-typedef struct _GtkInitFunction GtkInitFunction;
typedef struct _GtkQuitFunction GtkQuitFunction;
typedef struct _GtkKeySnooperData GtkKeySnooperData;
-struct _GtkInitFunction
-{
- GtkFunction function;
- gpointer data;
-};
-
struct _GtkQuitFunction
{
guint id;
@@ -187,8 +180,6 @@ static GList *current_events = NULL;
static GSList *main_loops = NULL; /* stack of currently executing main loops */
-static GList *init_functions = NULL; /* A list of init functions.
- */
static GList *quit_functions = NULL; /* A list of quit functions.
*/
static GSList *key_snoopers = NULL;
@@ -1293,8 +1284,6 @@ void
gtk_main (void)
{
GList *tmp_list;
- GList *functions;
- GtkInitFunction *init;
GMainLoop *loop;
gtk_main_loop_level++;
@@ -1302,19 +1291,6 @@ gtk_main (void)
loop = g_main_loop_new (NULL, TRUE);
main_loops = g_slist_prepend (main_loops, loop);
- tmp_list = functions = init_functions;
- init_functions = NULL;
-
- while (tmp_list)
- {
- init = tmp_list->data;
- tmp_list = tmp_list->next;
-
- (* init->function) (init->data);
- g_free (init);
- }
- g_list_free (functions);
-
if (g_main_loop_is_running (main_loops->data))
{
GDK_THREADS_LEAVE ();
@@ -2132,19 +2108,6 @@ gtk_device_grab_remove (GtkWidget *widget,
gtk_grab_notify (group, device, widget, new_grab_widget, FALSE);
}
-void
-gtk_init_add (GtkFunction function,
- gpointer data)
-{
- GtkInitFunction *init;
-
- init = g_new (GtkInitFunction, 1);
- init->function = function;
- init->data = data;
-
- init_functions = g_list_prepend (init_functions, init);
-}
-
guint
gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data)
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index dae07bf..1549d95 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -143,8 +143,6 @@ void gtk_device_grab_remove (GtkWidget *widget,
GdkDevice *device);
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-void gtk_init_add (GtkFunction function,
- gpointer data);
void gtk_quit_add_destroy (guint main_level,
GtkWidget *object);
guint gtk_quit_add (guint main_level,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]