summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-2-010
-rw-r--r--ChangeLog.pre-2-1010
-rw-r--r--ChangeLog.pre-2-210
-rw-r--r--ChangeLog.pre-2-410
-rw-r--r--ChangeLog.pre-2-610
-rw-r--r--ChangeLog.pre-2-810
-rw-r--r--configure.in5
-rw-r--r--gdk/gdkevents.c5
-rw-r--r--gdk/x11/gdkevents-x11.c5
-rw-r--r--gtk/gtkaccellabel.c2
-rw-r--r--gtk/gtkcontainer.c2
-rw-r--r--gtk/gtkmain.h15
-rw-r--r--gtk/gtkwidget.c2
14 files changed, 93 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d95a51225..22531467e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0d95a51225..22531467e5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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
diff --git a/configure.in b/configure.in
index 77b1d6a33a..11ce549ba6 100644
--- a/configure.in
+++ b/configure.in
@@ -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]]*$%%'`
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 50c7bf90a4..40f1578822 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -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);
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 50c7bf90a4..40f1578822 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -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);
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 2b3445a5f2..4345686d43 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -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);
}
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 22b67db560..541b30e4f0 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -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);
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 69dda5a9db..3f742b5139 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -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);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5f6f4cab0e..fe9281e3ca 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -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);
View Lorry Controller Status