summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-10-13 03:05:22 +0200
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-11-16 16:20:49 +0900
commit446c0fd1ad77a94be81990bddb6959ca6c1ab528 (patch)
tree0eabffd532607e9f6d3bb091932e68162578afcf /gtk
parentd5eee0d1bd55562e241ee7551ee2cb9e2f261984 (diff)
downloadgtk+-446c0fd1ad77a94be81990bddb6959ca6c1ab528.tar.gz
gtkmain: Remove deprecated gtk_init_add() function
https://bugzilla.gnome.org/show_bug.cgi?id=629955
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtk.symbols1
-rw-r--r--gtk/gtkmain.c37
-rw-r--r--gtk/gtkmain.h2
3 files changed, 0 insertions, 40 deletions
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index cd88fdaf0b..d81a8abb06 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 a4d067aa3c..1ba0ae767a 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 dae07bf4a3..1549d9586f 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,