Keep the compiler from giving some warnings.

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.


svn path=/trunk/; revision=3769
This commit is contained in:
Thomas Thurman 2008-06-27 03:52:31 +00:00 committed by Thomas James Alexander Thurman
parent 9d31fa61ed
commit 1aee3eff35
3 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,12 @@
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.
2008-06-26 Thomas Thurman <tthurman@gnome.org> 2008-06-26 Thomas Thurman <tthurman@gnome.org>
Refactor so the long scary stack functions are less long and scary: Refactor so the long scary stack functions are less long and scary:

View File

@ -2697,6 +2697,11 @@ xrender_destroy (MetaCompositor *compositor)
#endif #endif
} }
#if 0
/* Taking these out because they're empty and never called, and the
* compiler complains -- tthurman
*/
static void static void
xrender_begin_move (MetaCompositor *compositor, xrender_begin_move (MetaCompositor *compositor,
MetaWindow *window, MetaWindow *window,
@ -2741,7 +2746,8 @@ xrender_free_window (MetaCompositor *compositor,
/* destroy_win (compositor->display, window->xwindow, FALSE); */ /* destroy_win (compositor->display, window->xwindow, FALSE); */
#endif #endif
} }
#endif /* 0 */
static void static void
xrender_process_event (MetaCompositor *compositor, xrender_process_event (MetaCompositor *compositor,
XEvent *event, XEvent *event,

View File

@ -132,7 +132,8 @@ grab_area_at_mouse (GtkWidget *invisible,
gtk_container_add (GTK_CONTAINER (display_window), widget); gtk_container_add (GTK_CONTAINER (display_window), widget);
g_object_unref (G_OBJECT (magnified)); 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_signal_connect (G_OBJECT (display_window), "destroy",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);