diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-06-27 03:52:31 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-06-27 03:52:31 +0000 |
| commit | 1aee3eff351e1fbe5a2aa73101e2390447410817 (patch) | |
| tree | 0b248d7324d0f6a2d299608404f733cb80f530d3 | |
| parent | 9d31fa61ede73a4eb91efe9612680aaa7dbfc00e (diff) | |
| download | metacity-1aee3eff351e1fbe5a2aa73101e2390447410817.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/compositor/compositor-xrender.c | 8 | ||||
| -rw-r--r-- | src/tools/metacity-mag.c | 3 |
3 files changed, 18 insertions, 2 deletions
@@ -1,5 +1,14 @@ 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> + Refactor so the long scary stack functions are less long and scary: * stack.c (stack_ensure_sorted): the five parts of this long function diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index c2b60ac5..b128daf7 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -2697,6 +2697,11 @@ xrender_destroy (MetaCompositor *compositor) #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 @@ xrender_free_window (MetaCompositor *compositor, /* destroy_win (compositor->display, window->xwindow, FALSE); */ #endif } - +#endif /* 0 */ + static void xrender_process_event (MetaCompositor *compositor, XEvent *event, diff --git a/src/tools/metacity-mag.c b/src/tools/metacity-mag.c index 55da73cb..a5f1b1b2 100644 --- a/src/tools/metacity-mag.c +++ b/src/tools/metacity-mag.c @@ -132,7 +132,8 @@ grab_area_at_mouse (GtkWidget *invisible, 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); |