totem r6001 - in trunk: . src

[robinst svn gnome org]

Author: robinst
Date: Wed Feb 18 23:15:52 2009
New Revision: 6001
URL: http://svn.gnome.org/viewvc/totem?rev=6001&view=rev

Log:
2009-02-19  Robin Stocker  <robin nibor org>

	* src/totem-object.c: Fixed warnings about passing and comparison of
	incompatible pointer types



Modified:
   trunk/ChangeLog
   trunk/src/totem-object.c

Modified: trunk/src/totem-object.c
==============================================================================
--- trunk/src/totem-object.c	(original)
+++ trunk/src/totem-object.c	Wed Feb 18 23:15:52 2009
@@ -3222,7 +3222,7 @@
 		Totem *totem)
 {
 	if (event->type == GDK_BUTTON_PRESS && event->button == 1) {
-		gtk_widget_grab_focus (bvw);
+		gtk_widget_grab_focus (GTK_WIDGET (bvw));
 		return TRUE;
 	} else if (event->type == GDK_2BUTTON_PRESS && event->button == 1) {
 		totem_action_fullscreen_toggle(totem);
@@ -3452,9 +3452,9 @@
 		break;
 	case GDK_space:
 		{
-			GtkWidget *focus = gtk_window_get_focus (totem->win);
-			if (totem_is_fullscreen (totem) != FALSE ||
-			    focus == NULL || focus == totem->bvw || focus == totem->seek)
+			GtkWidget *focus = gtk_window_get_focus (GTK_WINDOW (totem->win));
+			if (totem_is_fullscreen (totem) != FALSE || focus == NULL ||
+			    focus == GTK_WIDGET (totem->bvw) || focus == totem->seek)
 				totem_action_play_pause (totem);
 			else
 				retval = FALSE;