Fix some gcc warnings

5 files changed, 7 insertions, 33 deletions

diff --git a/capplets/about-me/fingerprint-strings.h b/capplets/about-me/fingerprint-strings.h
index d1b919e9..20446a0b 100644
--- a/capplets/about-me/fingerprint-strings.h
+++ b/capplets/about-me/fingerprint-strings.h
@@ -58,32 +58,6 @@ static const char *finger_str_to_msg(const char *finger_name, gboolean is_swipe)
 }
 
 /* Cases not handled:
- * verify-no-match
- * verify-match
- * verify-unknown-error
- */
-static const char *verify_result_str_to_msg(const char *result, gboolean is_swipe)
-{
-	if (result == NULL)
-		return NULL;
-
-	if (strcmp (result, "verify-retry-scan") == 0) {
-		if (is_swipe == FALSE)
-			return N_("Place your finger on the reader again");
-		else
-			return N_("Swipe your finger again");
-	}
-	if (strcmp (result, "verify-swipe-too-short") == 0)
-		return N_("Swipe was too short, try again");
-	if (strcmp (result, "verify-finger-not-centered") == 0)
-		return N_("Your finger was not centered, try swiping your finger again");
-	if (strcmp (result, "verify-remove-and-retry") == 0)
-		return N_("Remove your finger, and try swiping your finger again");
-
-	return NULL;
-}
-
-/* Cases not handled:
  * enroll-completed
  * enroll-failed
  * enroll-unknown-error
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index 5ebd9523..ec9f916a 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -982,7 +982,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c
   
   /* select in treeview the theme set in gsettings */
   GtkTreeModel *treemodel;
-  treemodel = gtk_tree_view_get_model (list);
+  treemodel = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
   gchar *theme = g_settings_get_string (settings, key);
   gchar *path = find_string_in_model (treemodel, theme, COL_NAME);
   if (path)
@@ -990,7 +990,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c
     GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
     GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
     gtk_tree_selection_select_path (selection, treepath);
-    gtk_tree_view_scroll_to_cell (list, treepath, NULL, FALSE, 0, 0);
+    gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (list), treepath, NULL, FALSE, 0, 0);
     gtk_tree_path_free (treepath);
     g_free (path);
   }
diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index cf5c9deb..38e17530 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -208,11 +208,11 @@ scrollmethod_gsettings_changed_event (GSettings *settings,
 				GtkBuilder *dialog)
 {
 	int scroll_method = g_settings_get_int (touchpad_settings, "scroll-method");
-	gtk_toggle_button_set_active (WID ("scroll_disabled_radio"),
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("scroll_disabled_radio")),
 				scroll_method == 0);
-	gtk_toggle_button_set_active (WID ("scroll_edge_radio"),
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("scroll_edge_radio")),
 				scroll_method == 1);
-	gtk_toggle_button_set_active (WID ("scroll_twofinger_radio"),
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("scroll_twofinger_radio")),
 				scroll_method == 2);
 	gtk_widget_set_sensitive (WID ("horiz_scroll_toggle"),
 				 scroll_method != 0);
diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c
index 8ae289b8..634ac9ce 100644
--- a/font-viewer/font-view.c
+++ b/font-viewer/font-view.c
@@ -582,7 +582,7 @@ main(int argc, char **argv)
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin),
 					  drawing_area);
 #if !GTK_CHECK_VERSION (3, 0, 0)
-    g_signal_connect (drawing_area, "realize", create_text_pixmap, face);
+    g_signal_connect (drawing_area, "realize", G_CALLBACK(create_text_pixmap), face);
 #endif
 
     /* set the minimum size on the scrolled window to prevent
diff --git a/libslab/tile.c b/libslab/tile.c
index aaa4203e..d91c571d 100644
--- a/libslab/tile.c
+++ b/libslab/tile.c
@@ -308,7 +308,7 @@ tile_enter (GtkButton * widget)
 static void
 tile_leave (GtkButton * widget)
 {
-	if (gtk_widget_has_focus (widget))
+	if (gtk_widget_has_focus (GTK_WIDGET (widget)))
 		gtk_widget_set_state (GTK_WIDGET (widget), TILE_STATE_FOCUSED);
 	else
 		gtk_widget_set_state (GTK_WIDGET (widget), GTK_STATE_NORMAL);