diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-19 16:28:49 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-01 23:22:11 +0100 |
| commit | 1b8d58e81e5ef71c217b7dd3dc8f72e1552ff826 (patch) | |
| tree | 6a1a760516d8d894697745d0227f93189fb84502 | |
| parent | 4e64ecb701062f1b7962b2024f93fc1c6ebee13d (diff) | |
| download | pluma-1b8d58e81e5ef71c217b7dd3dc8f72e1552ff826.tar.bz2 pluma-1b8d58e81e5ef71c217b7dd3dc8f72e1552ff826.tar.xz | |
Gtk+-3.14 pluma-document.c: replace deprecated GdkColor with GdkRGBA
taken from:
https://git.gnome.org/browse/gedit/commit/?id=15994d8
| -rw-r--r-- | pluma/pluma-document.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/pluma/pluma-document.c b/pluma/pluma-document.c index f99d9f43..f311b05a 100644 --- a/pluma/pluma-document.c +++ b/pluma/pluma-document.c @@ -2246,9 +2246,15 @@ _pluma_document_get_seconds_since_last_save_or_load (PlumaDocument *doc) static void get_search_match_colors (PlumaDocument *doc, gboolean *foreground_set, +#if GTK_CHECK_VERSION (3, 14, 0) + GdkRGBA *foreground, + gboolean *background_set, + GdkRGBA *background) +#else GdkColor *foreground, gboolean *background_set, GdkColor *background) +#endif { GtkSourceStyleScheme *style_scheme; GtkSourceStyle *style; @@ -2273,6 +2279,21 @@ get_search_match_colors (PlumaDocument *doc, if (*foreground_set) { +#if GTK_CHECK_VERSION (3, 14, 0) + if (fg == NULL || + !gdk_rgba_parse (foreground, fg)) + { + *foreground_set = FALSE; + } + } + + if (*background_set) + { + if (bg == NULL || + !gdk_rgba_parse (background, bg)) + { + *background_set = FALSE; +#else if (fg == NULL || !gdk_color_parse (fg, foreground)) { @@ -2286,6 +2307,7 @@ get_search_match_colors (PlumaDocument *doc, !gdk_color_parse (bg, background)) { *background_set = FALSE; +#endif } } @@ -2299,7 +2321,11 @@ get_search_match_colors (PlumaDocument *doc, "Falling back to hard-coded colors " "for the \"found\" text tag."); +#if GTK_CHECK_VERSION (3, 14, 0) + gdk_rgba_parse (background, "#FFFF78"); +#else gdk_color_parse ("#FFFF78", background); +#endif *background_set = TRUE; *foreground_set = FALSE; @@ -2311,8 +2337,13 @@ sync_found_tag (PlumaDocument *doc, GParamSpec *pspec, gpointer data) { +#if GTK_CHECK_VERSION (3, 14, 0) + GdkRGBA fg; + GdkRGBA bg; +#else GdkColor fg; GdkColor bg; +#endif gboolean fg_set; gboolean bg_set; @@ -2325,10 +2356,17 @@ sync_found_tag (PlumaDocument *doc, &bg_set, &bg); g_object_set (doc->priv->found_tag, +#if GTK_CHECK_VERSION (3, 14, 0) + "foreground-rgba", fg_set ? &fg : NULL, + NULL); + g_object_set (doc->priv->found_tag, + "background-rgba", bg_set ? &bg : NULL, +#else "foreground-gdk", fg_set ? &fg : NULL, NULL); g_object_set (doc->priv->found_tag, "background-gdk", bg_set ? &bg : NULL, +#endif NULL); } |