[gnome-mag] Fix for bug #578798. Thanks Romain Perier!

[Carlos Eduardo Rodrigues Diógenes <carlosd src gnome org>]

commit d28d6f4e76a244cc8a78fde477ca7809f86cafb6
Author: Carlos Eduardo Rodrigues Diógenes <carlosd gnome org>
Date:   Sun Apr 25 19:53:49 2010 -0300

    Fix for bug #578798. Thanks Romain Perier!

 magnifier/magnifier.c                 |    9 +++++----
 magnifier/x11/gmag-graphical-server.c |    5 ++---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/magnifier/magnifier.c b/magnifier/magnifier.c
index bc11c72..ae93c64 100644
--- a/magnifier/magnifier.c
+++ b/magnifier/magnifier.c
@@ -309,8 +309,8 @@ magnifier_set_cursor_from_pixbuf (Magnifier *magnifier,
 		magnifier->priv->cursor = pixmap;
 		magnifier->priv->cursor_mask = mask;
 
-		xhot_string = g_object_get_data (cursor_pixbuf, "x_hot");
-		yhot_string = g_object_get_data (cursor_pixbuf, "y_hot");
+		xhot_string = g_object_get_data (G_OBJECT(cursor_pixbuf), "x_hot");
+		yhot_string = g_object_get_data (G_OBJECT(cursor_pixbuf), "y_hot");
 
 		if (xhot_string)
 			magnifier->cursor_hotspot.x = atoi (xhot_string);
@@ -1623,9 +1623,10 @@ magnifier_gobject_dispose (GObject *object)
 	BONOBO_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
 }
 
-static
+static inline
 CORBA_boolean
-impl_magnifier_support_colorblind_filters (Magnifier *magnifier)
+impl_magnifier_support_colorblind_filters (PortableServer_Servant _servant G_GNUC_UNUSED,
+					   CORBA_Environment *ev G_GNUC_UNUSED)
 {
 #ifdef HAVE_COLORBLIND
 	return CORBA_TRUE;
diff --git a/magnifier/x11/gmag-graphical-server.c b/magnifier/x11/gmag-graphical-server.c
index d5c617f..c7e9039 100644
--- a/magnifier/x11/gmag-graphical-server.c
+++ b/magnifier/x11/gmag-graphical-server.c
@@ -20,7 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
+#define GDK_PIXBUF_ENABLE_BACKEND
 #include "config.h"
 #include "magnifier.h"
 #include "magnifier-private.h"
@@ -48,7 +48,6 @@
 #include <stdlib.h>
 
 #include <glib.h>
-
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
@@ -450,7 +449,7 @@ gmag_gs_events_handler (GIOChannel *source, GIOCondition condition,
 static gboolean
 gmag_gs_use_damage ()
 {
-	gint major, event, error;
+	gint major, error;
 	if (XQueryExtension (
 		    dpy, "DAMAGE", &major, &damage_event_base, &error) &&
 	    !g_getenv ("MAGNIFIER_IGNORE_DAMAGE")) {