Fix warnings spotted by new gcc

7 files changed, 1 insertions, 19 deletions

diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 8f6384270..2b5b92cac 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -583,17 +583,14 @@ totem_embedded_launch_player (TotemEmbedded *embedded,
 	GdkScreen *screen;
 	GdkAppLaunchContext *ctx;
 	gboolean result;
-	const char *uri;
 
 	g_return_val_if_fail (embedded->app != NULL, FALSE);
 
 	if (embedded->type == TOTEM_PLUGIN_TYPE_NARROWSPACE
 		   && embedded->href_uri != NULL) {
 		uris = g_list_prepend (uris, embedded->href_uri);
-		uri = embedded->href_uri;
 	} else {
 		uris = g_list_prepend (uris, embedded->current_uri);
-		uri = embedded->current_uri;
 	}
 
 	ctx = gdk_display_get_app_launch_context (gtk_widget_get_display (embedded->window));
diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c
index d0dd2b615..9c805372d 100644
--- a/src/ev-sidebar.c
+++ b/src/ev-sidebar.c
@@ -64,10 +64,8 @@ static void
 ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 {
 	GObjectClass *g_object_class;
-	GtkWidgetClass *widget_class;
  
 	g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
-	widget_class = GTK_WIDGET_CLASS (ev_sidebar_class);
 	   
 	g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate));
 
diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
index 580cd1d05..f4ce8b863 100644
--- a/src/gsd-media-keys-window.c
+++ b/src/gsd-media-keys-window.c
@@ -675,12 +675,8 @@ gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
 static void
 gsd_media_keys_window_init (GsdMediaKeysWindow *window)
 {
-        GdkScreen *screen;
-
         window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
 
-        screen = gtk_widget_get_screen (GTK_WIDGET (window));
-
         if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
                 GtkBuilder *builder;
                 const gchar *objects[] = {"acme_box", NULL};
diff --git a/src/gsd-osd-window.c b/src/gsd-osd-window.c
index dea9decc4..ab8e65299 100644
--- a/src/gsd-osd-window.c
+++ b/src/gsd-osd-window.c
@@ -486,13 +486,10 @@ draw_when_composited (GtkWidget *widget, cairo_t *orig_cr)
 static void
 draw_when_not_composited (GtkWidget *widget, cairo_t *cr)
 {
-        GsdOsdWindow *window;
         GtkStyleContext *context;
         int width;
         int height;
 
-        window = GSD_OSD_WINDOW (widget);
-
         width = gtk_widget_get_allocated_width (widget);
         height = gtk_widget_get_allocated_width (widget);
         context = gtk_widget_get_style_context (widget);
diff --git a/src/plugins/chapters/totem-chapters.c b/src/plugins/chapters/totem-chapters.c
index ed1c4bc45..1b5a9d76d 100644
--- a/src/plugins/chapters/totem-chapters.c
+++ b/src/plugins/chapters/totem-chapters.c
@@ -171,7 +171,6 @@ add_chapter_to_the_list (gpointer	data,
 	TotemChaptersPlugin	*plugin;
 	GdkPixbuf		*pixbuf;
 	GtkTreeIter		iter;
-	GtkWidget		*tree;
 	GtkTreeStore		*store;
 	TotemCmmlClip		*clip;
 	gchar			*text, *start, *tip;
@@ -180,7 +179,6 @@ add_chapter_to_the_list (gpointer	data,
 	g_return_if_fail (TOTEM_IS_CHAPTERS_PLUGIN (user_data));
 
 	plugin = TOTEM_CHAPTERS_PLUGIN (user_data);
-	tree = plugin->priv->tree;
 	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (plugin->priv->tree)));
 	clip = ((TotemCmmlClip *) data);
 
diff --git a/src/totem-menu.c b/src/totem-menu.c
index fffed4ccf..3a8fb50ca 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -781,6 +781,7 @@ add_volume_to_menu (GVolume *volume,
 	char *menu_item_path;
 
 	disabled = FALSE;
+	device_path = NULL;
 
 	/* Add devices with blank CDs and audio CDs in them, but disable them */
 	if (drive != NULL) {
diff --git a/src/totem-playlist.c b/src/totem-playlist.c
index 7a23656b8..6edd37269 100644
--- a/src/totem-playlist.c
+++ b/src/totem-playlist.c
@@ -2598,9 +2598,6 @@ totem_playlist_set_title (TotemPlaylist *playlist, const char *title)
 			&iter,
 			playlist->priv->current);
 
-	if (&iter == NULL)
-		return FALSE;
-
 	escaped_title = g_markup_escape_text (title, -1);
 	gtk_list_store_set (store, &iter,
 			FILENAME_COL, title,
@@ -2632,8 +2629,6 @@ totem_playlist_set_playing (TotemPlaylist *playlist, TotemPlaylistStatus state)
 			&iter,
 			playlist->priv->current);
 
-	g_return_val_if_fail (&iter != NULL, FALSE);
-
 	gtk_list_store_set (store, &iter,
 			PLAYING_COL, state,
 			-1);