Add patches from Andrej Kacian (aka ticho@g.o)

(Portage version: 2.0.51.22-r2)

6 files changed, 321 insertions, 11 deletions

diff --git a/x11-misc/xpad/ChangeLog b/x11-misc/xpad/ChangeLog
index d211d5401906..245e7d5b8e27 100644
--- a/x11-misc/xpad/ChangeLog
+++ b/x11-misc/xpad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xpad
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/ChangeLog,v 1.37 2005/08/26 00:12:20 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/ChangeLog,v 1.38 2005/09/29 10:47:12 ferdy Exp $
+
+*xpad-2.9-r1 (29 Sep 2005)
+
+  29 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/xpad-2.9-smallicons.patch, +files/xpad-2.9-toolbar-chsize.patch,
+  +xpad-2.9-r1.ebuild:
+  Add patches from Andrej Kacian (aka ticho@g.o)
 
 *xpad-2.9 (26 Aug 2005)
 
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 765122dadb30..18d365dc8bd1 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4b59820430d903d6115e8578d9c9cb3a xpad-2.9.ebuild 614
+MD5 85535a5def6d90422149ebf331514a8f xpad-2.9-r1.ebuild 797
 MD5 1f6bce16512ef9fc6a5ca5efb92d5c71 xpad-2.6.ebuild 659
 MD5 92f4a7bc9064e467514e882077f89734 xpad-2.8.ebuild 611
 MD5 682a9191a39ddf9c2c61f4ba72ed1fe6 xpad-1.13.ebuild 722
@@ -10,11 +8,7 @@ MD5 bec94149899ec6cc9d70d755445b50cd metadata.xml 263
 MD5 116f1b1db749a9f8d0b7c8d075e5759d files/digest-xpad-2.6 61
 MD5 f5bcc36fc73693201d9f866161a46638 files/digest-xpad-2.8 61
 MD5 e9ef69e9c2202feeddc9d9c0ec955941 files/digest-xpad-2.9 61
+MD5 f163903dcdda0aa1e2dd273f5047355a files/xpad-2.9-smallicons.patch 625
+MD5 c9bd5d7230128220b1899aa4164686a9 files/xpad-2.9-toolbar-chsize.patch 12018
 MD5 d0f0a44ba012c5a3d6863afb093890d7 files/digest-xpad-1.13 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD4DBQFDDl56ViELBEf1JB0RArm6AJ9dJEMRB96gLj+L96bMXU9Qs2CmVgCYinqo
-9+4A+ccDAi2sDRhR/d24iQ==
-=vGvf
------END PGP SIGNATURE-----
+MD5 e9ef69e9c2202feeddc9d9c0ec955941 files/digest-xpad-2.9-r1 61
diff --git a/x11-misc/xpad/files/digest-xpad-2.9-r1 b/x11-misc/xpad/files/digest-xpad-2.9-r1
new file mode 100644
index 000000000000..e8f3100bcee8
--- /dev/null
+++ b/x11-misc/xpad/files/digest-xpad-2.9-r1
@@ -0,0 +1 @@
+MD5 e1d6daca8ba136917dcf3006e37da25d xpad-2.9.tar.bz2 224409
diff --git a/x11-misc/xpad/files/xpad-2.9-smallicons.patch b/x11-misc/xpad/files/xpad-2.9-smallicons.patch
new file mode 100644
index 000000000000..51bd65501f3a
--- /dev/null
+++ b/x11-misc/xpad/files/xpad-2.9-smallicons.patch
@@ -0,0 +1,11 @@
+diff -ur xpad-2.9/src/xpad-toolbar.c xpad-2.9-smallicons/src/xpad-toolbar.c
+--- xpad-2.9/src/xpad-toolbar.c	2004-12-24 02:49:44.000000000 +0100
++++ xpad-2.9-smallicons/src/xpad-toolbar.c	2005-09-28 00:01:03.000000000 +0200
+@@ -213,6 +213,7 @@
+ 	gtk_toolbar_set_tooltips (GTK_TOOLBAR (toolbar), TRUE);
+ 	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
+ 	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
++	gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
+ 	
+ 	g_signal_connect_swapped (xpad_settings (), "change-buttons", G_CALLBACK (xpad_toolbar_change_buttons), toolbar);
+ 	
diff --git a/x11-misc/xpad/files/xpad-2.9-toolbar-chsize.patch b/x11-misc/xpad/files/xpad-2.9-toolbar-chsize.patch
new file mode 100644
index 000000000000..ae0235a78cf3
--- /dev/null
+++ b/x11-misc/xpad/files/xpad-2.9-toolbar-chsize.patch
@@ -0,0 +1,265 @@
+diff -ur xpad-2.9/src/xpad-pad.c xpad-2.9-ticho/src/xpad-pad.c
+--- xpad-2.9/src/xpad-pad.c	2005-08-24 03:54:05.000000000 +0200
++++ xpad-2.9-ticho/src/xpad-pad.c	2005-09-27 17:34:45.000000000 +0200
+@@ -393,18 +393,21 @@
+ {
+ 	if (!GTK_WIDGET_VISIBLE (pad->priv->toolbar))
+ 	{
+-		GtkRequisition req;
+-		
+ 		if (GTK_WIDGET (pad)->window)
+ 			gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
+ 		gtk_widget_show (pad->priv->toolbar);
+-		if (!pad->priv->toolbar_height)
++		if (xpad_settings_get_toolbar_changes_window_size ( xpad_settings ()))
+ 		{
+-			gtk_widget_size_request (pad->priv->toolbar, &req);
+-			pad->priv->toolbar_height = req.height;
++			GtkRequisition req;
++
++			if (!pad->priv->toolbar_height)
++			{
++				gtk_widget_size_request (pad->priv->toolbar, &req);
++				pad->priv->toolbar_height = req.height;
++			}
++			pad->priv->height += pad->priv->toolbar_height;
++			gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+ 		}
+-		pad->priv->height += pad->priv->toolbar_height;
+-		gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+ 		if (GTK_WIDGET (pad)->window)
+ 			gdk_window_thaw_updates (GTK_WIDGET (pad)->window);
+ 	}
+@@ -417,9 +420,13 @@
+ 	{
+ 		if (GTK_WIDGET (pad)->window)
+ 			gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
+-		pad->priv->height -= pad->priv->toolbar_height;
+ 		gtk_widget_hide (pad->priv->toolbar);
+-		gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
++		if (xpad_settings_get_toolbar_changes_window_size (xpad_settings ()))
++		{
++			pad->priv->height -= pad->priv->toolbar_height;
++			gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
++			
++		}
+ 		if (GTK_WIDGET (pad)->window)
+ 			gdk_window_thaw_updates (GTK_WIDGET (pad)->window);
+ 	}
+diff -ur xpad-2.9/src/xpad-preferences.c xpad-2.9-ticho/src/xpad-preferences.c
+--- xpad-2.9/src/xpad-preferences.c	2005-03-04 00:50:42.000000000 +0100
++++ xpad-2.9-ticho/src/xpad-preferences.c	2005-09-27 17:34:12.000000000 +0200
+@@ -39,6 +39,7 @@
+ 	GtkWidget *editcheck;
+ 	GtkWidget *stickycheck;
+ 	GtkWidget *confirmcheck;
++	GtkWidget *toolbarchsizecheck;
+ 	
+ 	GtkWidget *textbutton;
+ 	GtkWidget *backbutton;
+@@ -47,6 +48,7 @@
+ 	guint notify_edit_handler;
+ 	guint notify_sticky_handler;
+ 	guint notify_confirm_handler;
++	guint notify_toolbarchsize_handler;
+ 	guint notify_font_handler;
+ 	guint notify_back_handler;
+ 	guint notify_text_handler;
+@@ -58,11 +60,13 @@
+ 	guint editcheck_handler;
+ 	guint stickycheck_handler;
+ 	guint confirmcheck_handler;
++	guint toolbarchsize_handler;
+ };
+ 
+ static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref);
+ static void change_sticky_check (GtkToggleButton *button, XpadPreferences *pref);
+ static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
++static void change_toolbarchsize_check (GtkToggleButton *button, XpadPreferences *pref);
+ static void change_color_check (GtkToggleButton *button, XpadPreferences *pref);
+ static void change_font_check (GtkToggleButton *button, XpadPreferences *pref);
+ static void change_text_color (GtkColorButton *button, XpadPreferences *pref);
+@@ -71,6 +75,7 @@
+ static void notify_edit (XpadPreferences *pref);
+ static void notify_sticky (XpadPreferences *pref);
+ static void notify_confirm (XpadPreferences *pref);
++static void notify_toolbarchsize (XpadPreferences *pref);
+ static void notify_fontname (XpadPreferences *pref);
+ static void notify_text_color (XpadPreferences *pref);
+ static void notify_back_color (XpadPreferences *pref);
+@@ -179,6 +184,7 @@
+ 	pref->priv->editcheck = gtk_check_button_new_with_mnemonic (_("_Edit lock"));
+ 	pref->priv->stickycheck = gtk_check_button_new_with_mnemonic (_("_Pads start on all workspaces"));
+ 	pref->priv->confirmcheck = gtk_check_button_new_with_mnemonic (_("_Confirm pad deletion"));
++	pref->priv->toolbarchsizecheck = gtk_check_button_new_with_mnemonic (_("_Toolbar changes window size."));
+ 	
+ 	gtk_dialog_add_button (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE);
+ 	gtk_dialog_set_default_response (GTK_DIALOG (pref), GTK_RESPONSE_CLOSE);
+@@ -236,6 +242,7 @@
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_settings ()));
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->stickycheck), xpad_settings_get_sticky (xpad_settings ()));
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_settings ()));
++	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->toolbarchsizecheck), xpad_settings_get_toolbar_changes_window_size (xpad_settings ()));
+ 	
+ 	vbox = gtk_vbox_new (FALSE, 6);
+ 	gtk_box_pack_start (GTK_BOX (vbox), pref->priv->antifontcheck, FALSE, FALSE, 0);
+@@ -275,7 +282,8 @@
+ 	
+ 	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->editcheck, FALSE, FALSE, 0);
+ 	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->stickycheck, FALSE, FALSE, 0);
+-	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);	
++	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);
++	gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->toolbarchsizecheck, FALSE, FALSE, 0);
+ 	
+ 	global_vbox = g_object_new (GTK_TYPE_VBOX,
+ 		"border-width", 6,
+@@ -290,6 +298,7 @@
+ 	pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref);
+ 	pref->priv->stickycheck_handler = g_signal_connect (pref->priv->stickycheck, "toggled", G_CALLBACK (change_sticky_check), pref);
+ 	pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), pref);
++	pref->priv->toolbarchsize_handler = g_signal_connect (pref->priv->toolbarchsizecheck, "toggled", G_CALLBACK (change_toolbarchsize_check), pref);
+ 	pref->priv->colorcheck_handler = g_signal_connect (pref->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), pref);
+ 	pref->priv->fontcheck_handler = g_signal_connect (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref);
+ 	pref->priv->text_handler = g_signal_connect (pref->priv->textbutton, "color-set", G_CALLBACK (change_text_color), pref);
+@@ -301,6 +310,7 @@
+ 	pref->priv->notify_sticky_handler = g_signal_connect_swapped (xpad_settings (), "notify::sticky", G_CALLBACK (notify_sticky), pref);
+ 	pref->priv->notify_edit_handler = g_signal_connect_swapped (xpad_settings (), "notify::edit-lock", G_CALLBACK (notify_edit), pref);
+ 	pref->priv->notify_confirm_handler = g_signal_connect_swapped (xpad_settings (), "notify::confirm-destroy", G_CALLBACK (notify_confirm), pref);
++	pref->priv->notify_toolbarchsize_handler = g_signal_connect_swapped (xpad_settings (), "notify::toolbar-chsize", G_CALLBACK (notify_toolbarchsize), pref);
+ 	
+ 	g_object_unref (size_group_labels);
+ 	
+@@ -308,7 +318,7 @@
+ 	
+ 	/* Make window not so squished */
+ 	gtk_widget_size_request (GTK_WIDGET (pref), &req);
+-	g_object_set (G_OBJECT (pref), "default-width", (gint) (req.height * 0.8), NULL);
++//	g_object_set (G_OBJECT (pref), "default-width", (gint) (req.height * 0.8), NULL);
+ }
+ 
+ static void
+@@ -394,6 +404,14 @@
+ }
+ 
+ static void
++change_toolbarchsize_check (GtkToggleButton *button, XpadPreferences *pref)
++{
++	g_signal_handler_block (xpad_settings (), pref->priv->notify_toolbarchsize_handler);
++	xpad_settings_set_toolbar_changes_window_size (xpad_settings (), gtk_toggle_button_get_active (button));
++	g_signal_handler_unblock (xpad_settings (), pref->priv->notify_toolbarchsize_handler);
++}
++
++static void
+ change_text_color (GtkColorButton *button, XpadPreferences *pref)
+ {
+ 	GdkColor color;
+@@ -516,3 +534,11 @@
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_settings ()));
+ 	g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
+ }
++
++static void
++notify_toolbarchsize (XpadPreferences *pref)
++{
++	g_signal_handler_block (pref->priv->toolbarchsizecheck, pref->priv->toolbarchsize_handler);
++	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->toolbarchsizecheck), xpad_settings_get_toolbar_changes_window_size (xpad_settings ()));
++	g_signal_handler_unblock (pref->priv->toolbarchsizecheck, pref->priv->toolbarchsize_handler);
++}
+diff -ur xpad-2.9/src/xpad-settings.c xpad-2.9-ticho/src/xpad-settings.c
+--- xpad-2.9/src/xpad-settings.c	2004-10-12 00:58:37.000000000 +0200
++++ xpad-2.9-ticho/src/xpad-settings.c	2005-09-27 17:05:15.000000000 +0200
+@@ -33,6 +33,7 @@
+ 	guint height;
+ 	gboolean has_decorations;
+ 	gboolean confirm_destroy;
++	gboolean toolbar_chsize;
+ 	gboolean edit_lock;
+ 	gboolean sticky;
+ 	gboolean has_toolbar;
+@@ -57,6 +58,7 @@
+   PROP_HEIGHT,
+   PROP_HAS_DECORATIONS,
+   PROP_CONFIRM_DESTROY,
++  PROP_TOOLBAR_CHANGES_WINDOW_SIZE,
+   PROP_STICKY,
+   PROP_EDIT_LOCK,
+   PROP_HAS_TOOLBAR,
+@@ -135,6 +137,14 @@
+ 	                                                       G_PARAM_READWRITE));
+ 	
+ 	g_object_class_install_property (gobject_class,
++	                                 PROP_TOOLBAR_CHANGES_WINDOW_SIZE,
++	                                 g_param_spec_boolean ("toolbar_chsize",
++	                                                       "Toolbar Changes Window Size",
++	                                                       "Whether toolbar displaying and hiding changes window size",
++	                                                       TRUE,
++	                                                       G_PARAM_READWRITE));
++	
++	g_object_class_install_property (gobject_class,
+ 	                                 PROP_STICKY,
+ 	                                 g_param_spec_boolean ("sticky",
+ 	                                                       "Default Stickiness",
+@@ -328,11 +338,28 @@
+ 	g_object_notify (G_OBJECT (settings), "confirm_destroy");
+ }
+ 
++void xpad_settings_set_toolbar_changes_window_size (XpadSettings *settings, gboolean changes)
++{
++	if (settings->priv->toolbar_chsize == changes)
++		return;
++	
++	settings->priv->toolbar_chsize = changes;
++	
++	save_to_file (settings, DEFAULTS_FILENAME);
++	
++	g_object_notify (G_OBJECT (settings), "toolbar_chsize");
++}
++
+ gboolean xpad_settings_get_confirm_destroy (XpadSettings *settings)
+ {
+ 	return settings->priv->confirm_destroy;
+ }
+ 
++gboolean xpad_settings_get_toolbar_changes_window_size (XpadSettings *settings)
++{
++	return settings->priv->toolbar_chsize;
++}
++
+ void xpad_settings_set_edit_lock (XpadSettings *settings, gboolean lock)
+ {
+ 	if (settings->priv->edit_lock == lock)
+@@ -556,6 +583,10 @@
+ 	case PROP_CONFIRM_DESTROY:
+ 		xpad_settings_set_confirm_destroy (settings, g_value_get_boolean (value));
+ 		break;
++
++	case PROP_TOOLBAR_CHANGES_WINDOW_SIZE:
++		xpad_settings_set_toolbar_changes_window_size (settings, g_value_get_boolean (value));
++		break;
+ 	
+ 	case PROP_STICKY:
+ 		xpad_settings_set_sticky (settings, g_value_get_boolean (value));
+@@ -620,6 +651,10 @@
+ 		g_value_set_boolean (value, xpad_settings_get_confirm_destroy (settings));
+ 		break;
+ 	
++	case PROP_TOOLBAR_CHANGES_WINDOW_SIZE:
++		g_value_set_boolean (value, xpad_settings_get_confirm_destroy (settings));
++		break;
++	
+ 	case PROP_STICKY:
+ 		g_value_set_boolean (value, xpad_settings_get_sticky (settings));
+ 		break;
+diff -ur xpad-2.9/src/xpad-settings.h xpad-2.9-ticho/src/xpad-settings.h
+--- xpad-2.9/src/xpad-settings.h	2005-08-24 03:39:19.000000000 +0200
++++ xpad-2.9-ticho/src/xpad-settings.h	2005-09-27 16:56:38.000000000 +0200
+@@ -66,6 +66,9 @@
+ void xpad_settings_set_confirm_destroy (XpadSettings *settings, gboolean confirm);
+ gboolean xpad_settings_get_confirm_destroy (XpadSettings *settings);
+ 
++void xpad_settings_set_toolbar_changes_window_size (XpadSettings *settings, gboolean changes);
++gboolean xpad_settings_get_toolbar_changes_window_size (XpadSettings *settings);
++
+ void xpad_settings_set_sticky (XpadSettings *settings, gboolean sticky);
+ gboolean xpad_settings_get_sticky (XpadSettings *settings);
+ 
diff --git a/x11-misc/xpad/xpad-2.9-r1.ebuild b/x11-misc/xpad/xpad-2.9-r1.ebuild
new file mode 100644
index 000000000000..524e68e818ef
--- /dev/null
+++ b/x11-misc/xpad/xpad-2.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/xpad-2.9-r1.ebuild,v 1.1 2005/09/29 10:47:12 ferdy Exp $
+
+inherit eutils
+
+DESCRIPTION="A GTK+ 2.0 based 'post-it' note system."
+HOMEPAGE="http://xpad.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xpad/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6.0"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.31
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-toolbar-chsize.patch"
+	epatch "${FILESDIR}/${P}-smallicons.patch"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}