diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-12-16 20:09:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-16 20:09:30 +0000 |
| commit | fcfe7370d8a9ac7b169282418e4f2bc58e6d9eb4 (patch) | |
| tree | b1629251195a04377d72cbb49a90af3db3c18afb /gtk/gtkselection.c | |
| parent | 0dcdac5828bfb039f0a35be2d21fd6b3b8750d4c (diff) | |
| download | gdk-pixbuf-fcfe7370d8a9ac7b169282418e4f2bc58e6d9eb4.tar.gz | |
Move main thread lock back to GDK - we need it there for locking when
Wed Dec 16 13:06:17 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main
thread lock back to GDK - we need it there for locking
when translating events. Rename things appropriately.
Wed Dec 16 11:44:21 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_expose): Fix a x/y typo.
CVS:
Diffstat (limited to 'gtk/gtkselection.c')
| -rw-r--r-- | gtk/gtkselection.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 06cb5ceac..2aa6c8cbd 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -49,7 +49,6 @@ #include <gdk/gdkx.h> /* we need this for gdk_window_lookup() */ #include "gtkmain.h" -#include "gtkprivate.h" #include "gtkselection.h" #include "gtksignal.h" @@ -1092,7 +1091,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) GList *tmp_list; gboolean retval; - GTK_THREADS_ENTER (); + GDK_THREADS_ENTER (); /* Determine if retrieval has finished by checking if it still in list of pending retrievals */ @@ -1129,7 +1128,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) retval = TRUE; /* timeout will happen again */ } - GTK_THREADS_LEAVE (); + GDK_THREADS_LEAVE (); return retval; } @@ -1334,7 +1333,7 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info) GList *tmp_list; gboolean retval; - GTK_THREADS_ENTER (); + GDK_THREADS_ENTER (); /* Determine if retrieval has finished by checking if it still in list of pending retrievals */ @@ -1369,7 +1368,7 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info) retval = TRUE; /* timeout will happen again */ } - GTK_THREADS_LEAVE (); + GDK_THREADS_LEAVE (); return retval; } |