summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-09-17 17:06:42 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-09-17 17:06:42 +0000
commit85d649b9a83238e1b79b187d43dac506e43fc799 (patch)
tree924575317e67ad3ae9aaae44cc4a9fe5002da958
parenta4bd690015ce22bada86cac6cab733bbd2e012c9 (diff)
downloadgdm-85d649b9a83238e1b79b187d43dac506e43fc799.tar.gz
Fix casting so that it doesn't generate warnings when you enter/leave
2007-09-12 Brian Cameron <brian.cameron@sun.com> * gui/modules/dwellmouselistener.c: Fix casting so that it doesn't generate warnings when you enter/leave various widgets. Fixes bug #440948. Patch by Gerd Kohlberger <lowfi@chello.at>. svn path=/trunk/; revision=5262
-rw-r--r--ChangeLog8
-rw-r--r--gui/modules/dwellmouselistener.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d837aa7..46be96ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-09-12 Brian Cameron <brian.cameron@sun.com>
+ * gui/modules/dwellmouselistener.c: Fix casting so that it doesn't
+ generate warnings when you enter/leave various widgets. Fixes
+ bug #440948. Patch by Gerd Kohlberger <lowfi@chello.at>.
+
+2007-09-12 Brian Cameron <brian.cameron@sun.com>
+
* gui/gdmlanguages.c: Fix Macedonian language so that the
language appears in the local language. Fixes bug #474530.
Patch by Arangel Angov <ufo@linux.net.mk>.
@@ -207,7 +213,7 @@
2007-07-31 Brian Cameron <brian.cameron@sun.com>
- * README: Some improvments.
+ * README: Some improvements.
2007-07-31 Lukasz Zalewski <lukas@dcs.qmul.ac.uk>
diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c
index fea0d37f..3ec72bb2 100644
--- a/gui/modules/dwellmouselistener.c
+++ b/gui/modules/dwellmouselistener.c
@@ -431,7 +431,6 @@ leave_enter_emission_hook (GSignalInvocationHint *ihint,
{
GObject *object;
GtkWidget *widget;
- GtkWindow *window;
GdkEventCrossing *event;
GdkRectangle rect;
GSList *li;
@@ -441,7 +440,6 @@ leave_enter_emission_hook (GSignalInvocationHint *ihint,
object = g_value_get_object (param_values + 0);
event = g_value_get_boxed (param_values + 1);
widget = GTK_WIDGET (object);
- window = GTK_WINDOW (object);
if (event->detail == GDK_NOTIFY_INFERIOR ||
!GTK_IS_WINDOW (object) || !GTK_WIDGET_TOPLEVEL (object)) {
@@ -577,7 +575,8 @@ leave_enter_emission_hook (GSignalInvocationHint *ihint,
continue;
#endif
- envp = get_exec_environment (gtk_window_get_screen(window));
+ envp = get_exec_environment (gtk_window_get_screen
+ (GTK_WINDOW(widget)));
if (debug_gestures)
syslog (LOG_WARNING, "Action is %s", action);