metacity r3769 - in trunk: . src/compositor src/tools

[tthurman svn gnome org]

Author: tthurman
Date: Fri Jun 27 03:52:31 2008
New Revision: 3769
URL: http://svn.gnome.org/viewvc/metacity?rev=3769&view=rev

Log:
2008-06-26  Thomas Thurman  <tthurman gnome org>

        Keep the compiler from giving some warnings.
        
        * src/compositor/compositor-xrender.c (xrender_begin_move,
          xrender_update_move, xrender_end_move, xrender_free_window): four
          functions which were never called and contain no code #iffed out.
        * src/tools/metacity-mag.c (grab_area_at_mouse): fixed typecast error.



Modified:
   trunk/ChangeLog
   trunk/src/compositor/compositor-xrender.c
   trunk/src/tools/metacity-mag.c

Modified: trunk/src/compositor/compositor-xrender.c
==============================================================================
--- trunk/src/compositor/compositor-xrender.c	(original)
+++ trunk/src/compositor/compositor-xrender.c	Fri Jun 27 03:52:31 2008
@@ -2697,6 +2697,11 @@
 #endif
 }
 
+#if 0
+/* Taking these out because they're empty and never called, and the
+ * compiler complains -- tthurman
+ */
+
 static void
 xrender_begin_move (MetaCompositor *compositor,
                     MetaWindow     *window,
@@ -2741,7 +2746,8 @@
   /* destroy_win (compositor->display, window->xwindow, FALSE); */
 #endif
 }
-   
+#endif /* 0 */
+
 static void
 xrender_process_event (MetaCompositor *compositor,
                        XEvent         *event,

Modified: trunk/src/tools/metacity-mag.c
==============================================================================
--- trunk/src/tools/metacity-mag.c	(original)
+++ trunk/src/tools/metacity-mag.c	Fri Jun 27 03:52:31 2008
@@ -132,7 +132,8 @@
   gtk_container_add (GTK_CONTAINER (display_window), widget);
   g_object_unref (G_OBJECT (magnified));
 
-  g_object_add_weak_pointer (G_OBJECT (display_window), (void**) &display_window);
+  g_object_add_weak_pointer (G_OBJECT (display_window),
+                             (gpointer) &display_window);
 
   g_signal_connect (G_OBJECT (display_window), "destroy",
                     G_CALLBACK (gtk_main_quit), NULL);