From 43aac66458d45d4aea59ddb652b3a7e60f5487a0 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 6 Apr 2011 22:23:35 +0200 Subject: [PATCH] [broadway] Fix all unnecessary warnings --- gdk/broadway/broadway.c | 2 ++ gdk/broadway/gdkdisplay-broadway.c | 3 +++ gdk/broadway/gdkeventsource.c | 3 --- gdk/broadway/gdkscreen-broadway.c | 4 ---- gdk/broadway/gdkwindow-broadway.c | 15 --------------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/gdk/broadway/broadway.c b/gdk/broadway/broadway.c index 478a4515e2..493efb86e4 100644 --- a/gdk/broadway/broadway.c +++ b/gdk/broadway/broadway.c @@ -18,12 +18,14 @@ static const char base64_alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +#if 0 /* Unused for now */ static void base64_uint8 (guint8 v, char *c) { c[0] = base64_alphabet[(v >> 0) & 0x3f]; c[1] = base64_alphabet[(v >> 6) & 0x3]; } +#endif static void base64_uint16 (guint32 v, char *c) diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c index c781cf5ceb..1c1ee78587 100644 --- a/gdk/broadway/gdkdisplay-broadway.c +++ b/gdk/broadway/gdkdisplay-broadway.c @@ -759,6 +759,9 @@ got_request (HttpRequest *request) start_input (request); else send_error (request, 404, "File not found"); + + g_free (escaped); + g_free (version); } static void diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c index db870ac7a2..0ff7b4d393 100644 --- a/gdk/broadway/gdkeventsource.c +++ b/gdk/broadway/gdkeventsource.c @@ -93,13 +93,10 @@ _gdk_broadway_events_got_input (GdkDisplay *display, BroadwayInputMsg *message) { GdkBroadwayDisplay *display_broadway = GDK_BROADWAY_DISPLAY (display); - GdkScreen *screen; GdkWindow *window; GdkEvent *event = NULL; GList *node; - screen = gdk_display_get_default_screen (display); - display_broadway->last_event_time = message->base.time; switch (message->base.type) { diff --git a/gdk/broadway/gdkscreen-broadway.c b/gdk/broadway/gdkscreen-broadway.c index 9df7199548..30f907f2ff 100644 --- a/gdk/broadway/gdkscreen-broadway.c +++ b/gdk/broadway/gdkscreen-broadway.c @@ -237,12 +237,8 @@ _gdk_broadway_screen_setup (GdkScreen *screen) static gboolean gdk_broadway_screen_is_composited (GdkScreen *screen) { - GdkBroadwayScreen *broadway_screen; - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - broadway_screen = GDK_BROADWAY_SCREEN (screen); - return FALSE; } diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c index 5b67ea91d0..3932049c64 100644 --- a/gdk/broadway/gdkwindow-broadway.c +++ b/gdk/broadway/gdkwindow-broadway.c @@ -329,12 +329,10 @@ _gdk_broadway_display_create_window_impl (GdkDisplay *display, gint attributes_mask) { GdkWindowImplBroadway *impl; - GdkBroadwayScreen *broadway_screen; GdkBroadwayDisplay *broadway_display; static int current_id = 1; /* 0 is the root window */ broadway_display = GDK_BROADWAY_DISPLAY (display); - broadway_screen = GDK_BROADWAY_SCREEN (screen); impl = g_object_new (GDK_TYPE_WINDOW_IMPL_BROADWAY, NULL); window->impl = (GdkWindowImpl *)impl; @@ -515,10 +513,6 @@ gdk_broadway_window_destroy_foreign (GdkWindow *window) static void gdk_broadway_window_destroy_notify (GdkWindow *window) { - GdkWindowImplBroadway *window_impl; - - window_impl = GDK_WINDOW_IMPL_BROADWAY (window->impl); - if (!GDK_WINDOW_DESTROYED (window)) { if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN) @@ -1009,14 +1003,10 @@ static void gdk_broadway_window_set_icon_name (GdkWindow *window, const gchar *name) { - GdkDisplay *display; - if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window)) return; - display = gdk_window_get_display (window); - g_object_set_qdata (G_OBJECT (window), g_quark_from_static_string ("gdk-icon-name-set"), GUINT_TO_POINTER (name != NULL)); } @@ -1235,21 +1225,16 @@ static void gdk_broadway_window_set_opacity (GdkWindow *window, gdouble opacity) { - GdkDisplay *display; - g_return_if_fail (GDK_IS_WINDOW (window)); if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL (window)) return; - display = gdk_window_get_display (window); - if (opacity < 0) opacity = 0; else if (opacity > 1) opacity = 1; - } static void