summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/compositor/compositor-xrender.c8
-rw-r--r--src/tools/metacity-mag.c3
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2993217..1793f7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 c2b60ac..b128daf 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 55da73c..a5f1b1b 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);