diff options
| -rw-r--r-- | gtk/gtkappchooserdialog.c | 4 | ||||
| -rw-r--r-- | gtk/gtktextview.c | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 5fb1db469e..0c922cd48f 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -577,6 +577,7 @@ gtk_app_chooser_dialog_finalize (GObject *object) GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object); g_free (self->priv->content_type); + g_free (self->priv->heading); G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->finalize (object); } @@ -685,7 +686,8 @@ gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass) P_("Heading"), P_("The text to show at the top of the dialog"), NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + G_PARAM_EXPLICIT_NOTIFY); g_object_class_install_property (gobject_class, PROP_HEADING, pspec); /* Bind class to template diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index c6d555ff2b..cfd441533f 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -9678,19 +9678,15 @@ append_bubble_action (GtkTextView *text_view, const gchar *signal, gboolean sensitive) { - GtkWidget *item, *image; + GtkWidget *item; - item = gtk_button_new (); + item = gtk_button_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_widget_set_focus_on_click (item, FALSE); - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (item), image); gtk_widget_set_tooltip_text (item, label); - gtk_style_context_add_class (gtk_widget_get_style_context (item), "image-button"); g_object_set_qdata (G_OBJECT (item), quark_gtk_signal, (char *)signal); g_signal_connect (item, "clicked", G_CALLBACK (activate_bubble_cb), text_view); gtk_widget_set_sensitive (GTK_WIDGET (item), sensitive); - gtk_widget_show (GTK_WIDGET (item)); + gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (toolbar), item); } @@ -9749,8 +9745,7 @@ bubble_targets_received (GtkClipboard *clipboard, can_insert = gtk_text_iter_can_insert (&iter, priv->editable); has_clipboard = gtk_selection_data_targets_include_text (data); - if (range_contains_editable_text (&sel_start, &sel_end, priv->editable) && has_selection) - append_bubble_action (text_view, toolbar, _("Select all"), "edit-select-all-symbolic", "select-all", !all_selected); + append_bubble_action (text_view, toolbar, _("Select all"), "edit-select-all-symbolic", "select-all", !all_selected); if (range_contains_editable_text (&sel_start, &sel_end, priv->editable) && has_selection) append_bubble_action (text_view, toolbar, _("Cut"), "edit-cut-symbolic", "cut-clipboard", TRUE); |