diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-11-18 01:55:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-11-18 01:55:34 +0000 |
| commit | dd913423d31bf65bc2082e20da3efa9cfd62764b (patch) | |
| tree | ce91fbf4bd1c7695318b791d2224c615a5190d6c | |
| parent | c296101a2f3a8cd3b016ea0466f975c183641e3f (diff) | |
| parent | 13f4d639fda16be1a2d43bd2629b77ce1042da19 (diff) | |
| download | gtk+-dd913423d31bf65bc2082e20da3efa9cfd62764b.tar.gz | |
Merge branch 'signal-naming' into 'master'
gtkstyleprovider: Rename -gtk-style-changed signal to have a valid name
See merge request GNOME/gtk!1176
| -rw-r--r-- | gtk/gtkstylecascade.c | 4 | ||||
| -rw-r--r-- | gtk/gtkstylecontext.c | 2 | ||||
| -rw-r--r-- | gtk/gtkstyleprovider.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkstylecascade.c b/gtk/gtkstylecascade.c index 4c94696742..d0010de2be 100644 --- a/gtk/gtkstylecascade.c +++ b/gtk/gtkstylecascade.c @@ -294,7 +294,7 @@ _gtk_style_cascade_set_parent (GtkStyleCascade *cascade, { g_object_ref (parent); g_signal_connect_swapped (parent, - "-gtk-private-changed", + "gtk-private-changed", G_CALLBACK (gtk_style_provider_changed), cascade); } @@ -325,7 +325,7 @@ _gtk_style_cascade_add_provider (GtkStyleCascade *cascade, data.provider = g_object_ref (provider); data.priority = priority; data.changed_signal_id = g_signal_connect_swapped (provider, - "-gtk-private-changed", + "gtk-private-changed", G_CALLBACK (gtk_style_provider_changed), cascade); diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 7ba0c3f61d..2072dd8a3b 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -265,7 +265,7 @@ gtk_style_context_set_cascade (GtkStyleContext *context, { g_object_ref (cascade); priv->cascade_changed_id = g_signal_connect (cascade, - "-gtk-private-changed", + "gtk-private-changed", G_CALLBACK (gtk_style_context_cascade_changed), context); } diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c index b9c19cd206..c454f19c1e 100644 --- a/gtk/gtkstyleprovider.c +++ b/gtk/gtkstyleprovider.c @@ -45,7 +45,7 @@ static guint signals[LAST_SIGNAL]; static void gtk_style_provider_default_init (GtkStyleProviderInterface *iface) { - signals[CHANGED] = g_signal_new (I_("-gtk-private-changed"), + signals[CHANGED] = g_signal_new (I_("gtk-private-changed"), G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkStyleProviderInterface, changed), |