From a3e5d0b97a3b8e9d10b77e6bab28516d8f3dd293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 23 Feb 2016 00:21:54 +0100 Subject: [PATCH] cleanup: Don't use gtk_widget_modify_{fg,bg}() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These function have been deprecated since Gtk 3.0 and is recommended to use _override_color() and _override_background_color() instead. As these new functions take a GdkRGBA as parameter, let's use gdk_rgba_parse() instead of gdk_color_parse(). Signed-off-by: Fabiano Fidêncio Acked-by: Jonathon Jongsma Acked-by: Pavel Grunt --- src/virt-viewer-notebook.c | 13 ++++++++++--- src/virt-viewer-window.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/virt-viewer-notebook.c b/src/virt-viewer-notebook.c index 98b663f..420c914 100644 --- a/src/virt-viewer-notebook.c +++ b/src/virt-viewer-notebook.c @@ -71,7 +71,7 @@ static void virt_viewer_notebook_init (VirtViewerNotebook *self) { VirtViewerNotebookPrivate *priv; - GdkColor color; + GdkRGBA color; self->priv = GET_PRIVATE(self); priv = self->priv; @@ -81,8 +81,15 @@ virt_viewer_notebook_init (VirtViewerNotebook *self) gtk_notebook_set_show_border(GTK_NOTEBOOK(self), FALSE); gtk_widget_show_all(priv->status); gtk_notebook_append_page(GTK_NOTEBOOK(self), priv->status, NULL); - gdk_color_parse("white", &color); - gtk_widget_modify_fg(priv->status, GTK_STATE_NORMAL, &color); + gdk_rgba_parse(&color, "white"); + /* FIXME: + * This method has been deprecated in 3.16. + * For more details on how to deal with this in the future, please, see: + * https://developer.gnome.org/gtk3/stable/GtkWidget.html#gtk-widget-override-color + * For the bug report about this deprecated function, please, see: + * https://bugs.freedesktop.org/show_bug.cgi?id=94276 + */ + gtk_widget_override_color(priv->status, GTK_STATE_FLAG_NORMAL, &color); } void diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index 3da50fb..8ce34ca 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -293,7 +293,7 @@ virt_viewer_window_init (VirtViewerWindow *self) { VirtViewerWindowPrivate *priv; GtkWidget *vbox; - GdkColor color; + GdkRGBA color; GSList *accels; self->priv = GET_PRIVATE(self); @@ -334,8 +334,15 @@ virt_viewer_window_init (VirtViewerWindow *self) virt_viewer_window_toolbar_setup(self); gtk_box_pack_end(GTK_BOX(vbox), priv->layout, TRUE, TRUE, 0); - gdk_color_parse("black", &color); - gtk_widget_modify_bg(priv->layout, GTK_STATE_NORMAL, &color); + gdk_rgba_parse(&color, "black"); + /* FIXME: + * This method has been deprecated in 3.16. + * For more details on how to deal with this in the future, please, see: + * https://developer.gnome.org/gtk3/stable/GtkWidget.html#gtk-widget-override-background-color + * For the bug report about this deprecated function, please, see: + * https://bugs.freedesktop.org/show_bug.cgi?id=94276 + */ + gtk_widget_override_background_color(priv->layout, GTK_STATE_FLAG_NORMAL, &color); priv->window = GTK_WIDGET(gtk_builder_get_object(priv->builder, "viewer")); gtk_window_add_accel_group(GTK_WINDOW(priv->window), priv->accel_group);