AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't add the gthread libs to GLIB_LIBS either, or -lgthread -lpthread

Browse Source 
Sat Dec 19 17:28:30 1998  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Don't add the gthread libs to
	GLIB_LIBS either, or -lgthread -lpthread will get
	pulled into all applications because of shlib deps.

	* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
	Use GLIB's priority #define. Revise scale of
	priorities.
This commit is contained in:
Owen Taylor 1998-12-19 22:27:03 +00:00 committed by Owen Taylor
parent 5225ae6105
commit 651e2f744f
14 changed files with 93 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-0
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Sat Dec 19 17:28:30 1998 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't add the gthread libs to
GLIB_LIBS either, or -lgthread -lpthread will get
pulled into all applications because of shlib deps.
* gtk/gtkmain.h gtk/gtkwidget.c gtk/gtk gdk/gdk:
Use GLIB's priority #define. Revise scale of
priorities.
Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
* gtk/gtkmain.c: always run a g_main_iteration, even if

5
configure.in
View File

@ -188,6 +188,7 @@ if test x$with_glib = x ; then
# we do not want to make all gtk progs to link to thread libraries.
glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
glib_libs=`$GLIB_CONFIG glib gmodule --libs`
GLIB_LIBS="$glib_libs"
else
# Use uninstalled glib (assume they got the version right)
@ -199,8 +200,8 @@ else
fi
# For use in gtk-config
glib_cflags=`$GLIB_CONFIG --cflags`
glib_libs=`$GLIB_CONFIG --libs`
glib_cflags=`$GLIB_CONFIG --cflags gmodule`
glib_libs=`$GLIB_CONFIG --libs gmodule`
glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`

5
gdk/gdkevents.c
View File

@ -122,7 +122,7 @@ gdk_events_init (void)
GDK_NOTE (MISC,
g_message ("connection number: %d", connection_number));
g_source_add (-10, TRUE, &event_funcs, NULL, NULL, NULL);
g_source_add (G_PRIORITY_DEFAULT, TRUE, &event_funcs, NULL, NULL, NULL);
event_poll_fd.fd = connection_number;
event_poll_fd.events = G_IO_IN;
@ -767,7 +767,8 @@ gdk_input_add_full (gint source,
cond |= G_IO_ERR|G_IO_HUP|G_IO_NVAL;
channel = g_io_channel_unix_new (source);
result = g_io_add_watch_full (channel, 0, cond, gdk_io_invoke,
result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond,
gdk_io_invoke,
closure, gdk_io_destroy);
g_io_channel_unref (channel);

5
gdk/x11/gdkevents-x11.c
View File

@ -122,7 +122,7 @@ gdk_events_init (void)
GDK_NOTE (MISC,
g_message ("connection number: %d", connection_number));
g_source_add (-10, TRUE, &event_funcs, NULL, NULL, NULL);
g_source_add (G_PRIORITY_DEFAULT, TRUE, &event_funcs, NULL, NULL, NULL);
event_poll_fd.fd = connection_number;
event_poll_fd.events = G_IO_IN;
@ -767,7 +767,8 @@ gdk_input_add_full (gint source,
cond |= G_IO_ERR|G_IO_HUP|G_IO_NVAL;
channel = g_io_channel_unix_new (source);
result = g_io_add_watch_full (channel, 0, cond, gdk_io_invoke,
result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond,
gdk_io_invoke,
closure, gdk_io_destroy);
g_io_channel_unref (channel);

2
gtk/gtkaccellabel.c
View File

@ -304,7 +304,7 @@ gtk_accel_label_queue_refetch (GtkAccelLabel *accel_label)
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_label->queue_id == 0)
accel_label->queue_id = gtk_idle_add_priority (GTK_PRIORITY_HIGH - 2,
accel_label->queue_id = gtk_idle_add_priority (G_PRIORITY_HIGH_IDLE,
(GtkFunction) gtk_accel_label_refetch_idle,
accel_label);
}

2
gtk/gtkcontainer.c
View File

@ -866,7 +866,7 @@ gtk_container_queue_resize (GtkContainer *container)
{
GTK_PRIVATE_SET_FLAG (resize_container, GTK_RESIZE_PENDING);
if (container_resize_queue == NULL)
gtk_idle_add_priority (GTK_PRIORITY_INTERNAL - 1,
gtk_idle_add_priority (GTK_PRIORITY_RESIZE,
gtk_container_idle_sizer,
NULL);
container_resize_queue = g_slist_prepend (container_resize_queue, resize_container);

15
gtk/gtkmain.h
View File

@ -28,10 +28,17 @@
extern "C" {
#endif /* __cplusplus */
#define GTK_PRIORITY_HIGH -20
#define GTK_PRIORITY_INTERNAL -10
#define GTK_PRIORITY_DEFAULT -5
#define GTK_PRIORITY_LOW 10
/* Priorities for redrawing and resizing
*/
#define GTK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20)
#define GTK_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 10)
/* Deprecated. Use G_PRIORITY #define's instead
*/
#define GTK_PRIORITY_HIGH G_PRIORITY_HIGH
#define GTK_PRIORITY_INTERNAL GTK_PRIORITY_REDRAW
#define GTK_PRIORITY_DEFAULT G_PRIORITY_DEFAULT_IDLE
#define GTK_PRIORITY_LOW G_PRIORITY_LOW
typedef void (*GtkModuleInitFunc) (gint *argc,
gchar ***argv);

2
gtk/gtkwidget.c
View File

@ -1731,7 +1731,7 @@ gtk_widget_queue_draw_data (GtkWidget *widget,
{
GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
if (gtk_widget_redraw_queue == NULL)
gtk_idle_add_priority (GTK_PRIORITY_INTERNAL,
gtk_idle_add_priority (GTK_PRIORITY_REDRAW,
gtk_widget_idle_draw,
NULL);
gtk_widget_redraw_queue = g_slist_prepend (gtk_widget_redraw_queue, widget);