Stop using gtk_css_provider_load_from_data

diff --git a/demos/gtk-demo/css_blendmodes.c b/demos/gtk-demo/css_blendmodes.c
index 81884c2234cd85a8671ee41f08cc3bc6e3ea0989..87c7a8ad68bfefda21f16fba7e27c605ca84b660 100644 (file)
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -50,7 +50,7 @@ update_css_for_blend_mode (GtkCssProvider *provider,
                          blend_mode,
                          blend_mode);
 
-  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_css_provider_load_from_string (provider, css);
 
   g_bytes_unref (bytes);
   g_free (css);

diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index 2373a71f12b8173b71d79028d8ad6ecdff3cf9ce..16c4091c0c6e7aebab4979f642ccd2dfb2bdfa02 100644 (file)
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -70,7 +70,7 @@ set_color (CanvasItem *item,
   css = g_strdup_printf ("#%s { background: %s; }", name, str);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_css_provider_load_from_string (provider, css);
   gtk_style_context_add_provider_for_display (gtk_widget_get_display (item->label), GTK_STYLE_PROVIDER (provider), 700);
   item->provider = GTK_STYLE_PROVIDER (provider);
 
@@ -765,7 +765,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         g_string_append_printf (css, ".canvasitem.%s { background: %s; }\n", colors[i], colors[i]);
 
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css->str, css->len);
+      gtk_css_provider_load_from_string (provider, css->str);
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);

diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 40e1bbb6c26609b599778f04aad3ec11912484d2..bf0eef7b570c18ea9954b1fcb28d3c43b94d13ef 100644 (file)
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -301,7 +301,7 @@ do_fishbowl (GtkWidget *do_widget)
   if (provider == NULL)
     {
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1);
+      gtk_css_provider_load_from_string (provider, css);
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/demos/gtk-demo/gltransition.c b/demos/gtk-demo/gltransition.c
index e588a529246f63bbf18f054f6e6a22ba7b579a07..08f77bad54e5ecf432afb7944dc0601bf1422225 100644 (file)
--- a/demos/gtk-demo/gltransition.c
+++ b/demos/gtk-demo/gltransition.c
@@ -337,7 +337,7 @@ create_gltransition_window (GtkWidget *do_widget)
                    1, 1, 1, 1);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, "button.small { padding: 0; }", -1);
+  gtk_css_provider_load_from_string (provider, "button.small { padding: 0; }");
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/demos/gtk-demo/listview_ucd.c b/demos/gtk-demo/listview_ucd.c
index b1bde50eacc2cc0c57965819084038b5064f5af4..2a71ef88eda509ce328fb71758e9c2f502260e80 100644 (file)
--- a/demos/gtk-demo/listview_ucd.c
+++ b/demos/gtk-demo/listview_ucd.c
@@ -367,7 +367,7 @@ do_listview_ucd (GtkWidget *do_widget)
       gtk_label_set_width_chars (GTK_LABEL (label), 2);
       gtk_widget_add_css_class (label, "enormous");
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, "label.enormous { font-size: 80px; }", -1);
+      gtk_css_provider_load_from_string (provider, "label.enormous { font-size: 80px; }");
       gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), 800);
       gtk_widget_set_hexpand (label, TRUE);
       gtk_box_append (GTK_BOX (box), label);

diff --git a/demos/gtk-demo/peg_solitaire.c b/demos/gtk-demo/peg_solitaire.c
index b0a07c4ea5438a1af022d93de9c8aa9050d17e1b..4ef43f1c297a7a028a09ebc92f90208ab1c2c48a 100644 (file)
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -384,7 +384,7 @@ create_board (GtkWidget *window)
     "}";
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_css_provider_load_from_string (provider, css);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               800);

diff --git a/demos/node-editor/node-editor-application.c b/demos/node-editor/node-editor-application.c
index 42a83e911abee431be463049ad513c0764c2674d..10086e49377c1e762238334b3013fb0310c2123a 100644 (file)
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -201,7 +201,7 @@ node_editor_application_startup (GApplication *app)
 
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_css_provider_load_from_string (provider, css);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index d0e71c8d37305d8042848418c95bbbee71e59d88..e8515a4beaa9a4437eab3fc80dc16e1a045d0045 100644 (file)
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -260,7 +260,7 @@ update_style (GtkInspectorCssEditor *ce)
   ce->priv->errors = NULL;
 
   text = get_current_text (ce->priv->text);
-  gtk_css_provider_load_from_data (ce->priv->provider, text, -1);
+  gtk_css_provider_load_from_string (ce->priv->provider, text);
   g_free (text);
 }
 

diff --git a/testsuite/css/api.c b/testsuite/css/api.c
index d0ed09e98a2f2c507c2118ced88f4904059add3a..97f907618f43fd7aefaffd29128a62436aba5269 100644 (file)
--- a/testsuite/css/api.c
+++ b/testsuite/css/api.c
@@ -25,10 +25,13 @@ gtk_css_provider_load_data_not_null_terminated (void)
 {
   GtkCssProvider *p;
   const char data[3] = {'*', '{', '}'};
+  GBytes *bytes;
 
-  p = gtk_css_provider_new();
+  p = gtk_css_provider_new ();
 
-  gtk_css_provider_load_from_data(p, data, sizeof (data));
+  bytes = g_bytes_new_static (data, sizeof (data));
+  gtk_css_provider_load_from_bytes (p, bytes);
+  g_bytes_unref (bytes);
 
   g_object_unref (p);
 }

diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c
index 500dfce9161f393fa72b69fe4dc26b2a48abd8b7..9dffd9bfb821204eaad46ba74e9b2ffac75b0960 100644 (file)
--- a/testsuite/gtk/cssprovider.c
+++ b/testsuite/gtk/cssprovider.c
@@ -17,7 +17,7 @@ test_section_in_load_from_data (void)
   provider = gtk_css_provider_new ();
   g_signal_connect (provider, "parsing-error",
                     G_CALLBACK (assert_section_is_not_null), NULL);
-  gtk_css_provider_load_from_data (provider, "random garbage goes here", -1);
+  gtk_css_provider_load_from_string (provider, "random garbage goes here");
   g_object_unref (provider);
 }