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

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.

diff --git a/ChangeLog b/ChangeLog
index 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 0d95a512250320a6b14c7144b8958f332900c469..22531467e5a77d4f648d8d0767ac6cf3de83c8a3 100644 (file)
--- 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 77b1d6a33a325d6f635d366d657d9a30dbc08272..11ce549ba605cccbe397791d5ec7def4cbc60fc7 100644 (file)
--- 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 50c7bf90a4df18838b32ba350f4999ba8b906441..40f15788220764c08ece10958b2b5f8d986cbb8a 100644 (file)
--- 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 50c7bf90a4df18838b32ba350f4999ba8b906441..40f15788220764c08ece10958b2b5f8d986cbb8a 100644 (file)
--- 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 2b3445a5f2abce714574219fe8a128fc79c43894..4345686d437916f7db11068c581d9de25ebd2b4b 100644 (file)
--- 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 22b67db5603ce1665ca12c9253698476a9ad0116..541b30e4f0b528355ac0ec21c6dddd391ceed009 100644 (file)
--- 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 69dda5a9dbc80775e46d17fb20a2b7a9ad59e142..3f742b5139bc3a8e0f8a9f1697f6cb1379fed506 100644 (file)
--- 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 5f6f4cab0e0bdd7864de84f9315170e452bfc5cf..fe9281e3caf2c281cfa2a43f4154f8ac56218159 100644 (file)
--- 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);