aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-12-23 04:27:42 +0800
committermarcus <marcus@FreeBSD.org>2004-12-23 04:27:42 +0800
commitd2cf249090fd1ea03ed57b0b5b22a12ce258b683 (patch)
tree54e095f31c1f2c697a791ced0e3998bbc08b4ab9
parentfd1803cf87eced04305b376f97bde9db8e07ba96 (diff)
downloadfreebsd-ports-gnome-d2cf249090fd1ea03ed57b0b5b22a12ce258b683.tar.gz
freebsd-ports-gnome-d2cf249090fd1ea03ed57b0b5b22a12ce258b683.tar.zst
freebsd-ports-gnome-d2cf249090fd1ea03ed57b0b5b22a12ce258b683.zip
Fix build on 4.X.
Reported by: Mike Harding <mvh@ix.netcom.com>
-rw-r--r--security/seahorse/files/patch-libseahorse_seahorse-key-store.c22
-rw-r--r--security/seahorse/files/patch-src_seahorse-generate-druid.c13
2 files changed, 35 insertions, 0 deletions
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
new file mode 100644
index 000000000000..fc8b7af60033
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
@@ -0,0 +1,22 @@
+--- libseahorse/seahorse-key-store.c.orig Wed Dec 22 15:18:27 2004
++++ libseahorse/seahorse-key-store.c Wed Dec 22 15:19:48 2004
+@@ -184,6 +184,8 @@
+ {
+ GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
+ SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj);
++ guint cols;
++ GType* types;
+
+ /* init private vars */
+ skstore->priv = g_new0 (SeahorseKeyStorePriv, 1);
+@@ -191,8 +193,8 @@
+ NULL, (GDestroyNotify)seahorse_key_row_free);
+
+ /* Setup the store */
+- guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
+- GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
++ cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
++ types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
+ gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types);
+
+ /* Setup the sort and filter */
diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c
new file mode 100644
index 000000000000..9e356ed1aac0
--- /dev/null
+++ b/security/seahorse/files/patch-src_seahorse-generate-druid.c
@@ -0,0 +1,13 @@
+--- src/seahorse-generate-druid.c.orig Wed Dec 22 15:22:02 2004
++++ src/seahorse-generate-druid.c Wed Dec 22 15:22:22 2004
+@@ -173,8 +173,9 @@
+ gboolean
+ on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget)
+ {
++ GtkWidget *druidpage;
+ g_print("go to finish\n");
+- GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
++ druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
+
+ gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage));
+ gtk_widget_show (druidpage);