summaryrefslogtreecommitdiffstats
path: root/x11/yelp
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-10-18 21:37:34 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-10-18 21:37:34 +0800
commit8ca967a9f6804638dbf9e3ba34014fbc4995d60e (patch)
treeb6aa61cb868fc8e2282ba2a0d581c62398edbaff /x11/yelp
parent0361c6c54699f46b64a9b5babfc6ff7fc60490a7 (diff)
downloadmarcuscom-ports-8ca967a9f6804638dbf9e3ba34014fbc4995d60e.tar.gz
marcuscom-ports-8ca967a9f6804638dbf9e3ba34014fbc4995d60e.tar.zst
marcuscom-ports-8ca967a9f6804638dbf9e3ba34014fbc4995d60e.zip
This patch corrects invalid creation of navigation buttons in yelp's find bar.
Also it can prevent spontaneous crash during yelp's window initialization. PR: ports/151523 Submitted by: Maxim Samsonov <xors@mne.ru> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14817 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/yelp')
-rw-r--r--x11/yelp/Makefile3
-rw-r--r--x11/yelp/files/patch-src_yelp-window.c37
2 files changed, 39 insertions, 1 deletions
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 40554943d..1a08197fe 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.162 2010/09/28 15:55:51 kwm Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.163 2010/09/30 06:15:45 kwm Exp $
#
PORTNAME= yelp
PORTVERSION= 2.30.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/yelp/files/patch-src_yelp-window.c b/x11/yelp/files/patch-src_yelp-window.c
new file mode 100644
index 000000000..37acdfcc5
--- /dev/null
+++ b/x11/yelp/files/patch-src_yelp-window.c
@@ -0,0 +1,37 @@
+--- src/yelp-window.c.orig 2010-10-16 23:06:05.000000000 +0400
++++ src/yelp-window.c 2010-10-17 03:58:57.000000000 +0400
+@@ -1555,28 +1555,26 @@
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry);
+
+- box = gtk_hbox_new (FALSE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ label = gtk_label_new_with_mnemonic (_("Find _Previous"));
+- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0);
+- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+- priv->find_prev = gtk_tool_button_new (box, NULL);
++ priv->find_prev = gtk_tool_button_new (arrow, NULL);
++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_prev), label);
+ g_signal_connect (priv->find_prev,
+ "clicked",
+ G_CALLBACK (window_find_clicked_cb),
+ window);
++ gtk_tool_item_set_is_important (priv->find_prev, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_prev, -1);
+
+- box = gtk_hbox_new (FALSE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ label = gtk_label_new_with_mnemonic (_("Find _Next"));
+- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0);
+- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+- priv->find_next = gtk_tool_button_new (box, NULL);
++ priv->find_next = gtk_tool_button_new (arrow, NULL);
++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_next), label);
+ g_signal_connect (priv->find_next,
+ "clicked",
+ G_CALLBACK (window_find_clicked_cb),
+ window);
++ gtk_tool_item_set_is_important (priv->find_next, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_next, -1);
+
+ priv->find_sep = gtk_separator_tool_item_new ();