Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: GitHub noreply@github.com Date: Thu, 18 Apr 2024 23:42:53 UTC Commit: 0acee692b122890c7bd1085c9b8b1dcd63a51bd8 https://github.com/geany/geany/commit/0acee692b122890c7bd1085c9b8b1dcd63a51b...
Log Message: ----------- Merge pull request #3838 from b4n/search-after-toolbar-edit
Fix search entry after editing the toolbar
Modified Paths: -------------- src/geanyentryaction.c
Modified: src/geanyentryaction.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -42,7 +42,6 @@ struct _GeanyEntryActionPrivate { GtkWidget *entry; gboolean numeric; - gboolean connected; };
enum @@ -112,7 +111,7 @@ static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widge GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
/* make sure not to connect handlers twice */ - if (! priv->connected) + if (! g_object_get_data(G_OBJECT(widget), "gea-connected")) { if (priv->numeric) g_signal_connect(priv->entry, "insert-text", @@ -122,7 +121,7 @@ static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widge g_signal_connect(priv->entry, "activate-backward", G_CALLBACK(delegate_entry_activate_backward_cb), action);
- priv->connected = TRUE; + g_object_set_data(G_OBJECT(widget), "gea-connected", action /* anything non-NULL */); }
GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget); @@ -176,7 +175,6 @@ static void geany_entry_action_init(GeanyEntryAction *action) priv = action->priv; priv->entry = NULL; priv->numeric = FALSE; - priv->connected = FALSE; }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).