Sigh.. since upstream doesn't care about providing tarballs that

compile, nor instructions on how to compile it, we can't update to
0.5.8, but at least we can backport gtk-entry code and callers from it.
This is ugly^Whackish^Whorrible, but at least it really works again.
While here, drop MAINTAINERship, i don't want to be responsible for that
pile of crap anymore.
This commit is contained in:
landry 2009-10-11 20:33:00 +00:00
parent cdda1fcecb
commit a6956954c5
5 changed files with 1870 additions and 33 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2009/10/11 11:14:18 landry Exp $
# $OpenBSD: Makefile,v 1.14 2009/10/11 20:33:00 landry Exp $
COMMENT-main= common files for kazehakase
COMMENT-gecko= lightweight gecko-based web browser
@ -10,13 +10,12 @@ SHARED_ONLY= Yes
VERSION= 0.5.6
DISTNAME= kazehakase-${VERSION}
PKGNAME-main= kazehakase-common-${VERSION}p2
PKGNAME-gecko= ${DISTNAME}p4
PKGNAME-webkit= kazehakase-webkit-${VERSION}p3
PKGNAME-main= kazehakase-common-${VERSION}p3
PKGNAME-gecko= ${DISTNAME}p5
PKGNAME-webkit= kazehakase-webkit-${VERSION}p4
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/33533/}
HOMEPAGE= http://kazehakase.sourceforge.jp/
MAINTAINER= Landry Breuil <gaston@gcu.info>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_actions_kz-smart-bookmark-action_c,v 1.1 2009/10/11 20:33:00 landry Exp $
--- src/actions/kz-smart-bookmark-action.c.orig Sun Oct 11 22:10:25 2009
+++ src/actions/kz-smart-bookmark-action.c Sun Oct 11 22:12:03 2009
@@ -884,21 +884,21 @@ update_icon_and_bgtext(KzSmartBookmarkAction *action)
title);
kz_entry_set_arrow(KZ_ENTRY(entry),
is_folder);
-
- if (favicon)
- {
- kz_entry_set_icon_from_pixbuf(KZ_ENTRY(entry),
- favicon);
- g_object_unref(favicon);
- }
- else
- {
- kz_entry_set_icon_from_stock(KZ_ENTRY(entry),
- stock_id,
- GTK_ICON_SIZE_MENU);
- }
- gtk_widget_queue_resize(GTK_WIDGET(entry));
}
+ if (favicon)
+ {
+ gtk_entry_set_icon_from_pixbuf(entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ favicon);
+ g_object_unref(favicon);
+ }
+ else
+ {
+ gtk_entry_set_icon_from_stock(entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ stock_id);
+ }
+ gtk_widget_queue_resize(GTK_WIDGET(entry));
}
}

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_kz-statusbar_c,v 1.1 2009/10/11 20:33:00 landry Exp $
--- src/kz-statusbar.c.orig Sun Oct 11 22:16:38 2009
+++ src/kz-statusbar.c Sun Oct 11 22:17:26 2009
@@ -144,7 +144,8 @@ kz_statusbar_init (KzStatusbar *bar)
gtk_widget_set_tooltip_text(toggle, _("Find direction"));
/* find entry */
- priv->find_area = kz_entry_new_with_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+ priv->find_area = kz_entry_new();
+ gtk_entry_set_icon_from_stock(GTK_ENTRY(priv->find_area), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
gtk_box_pack_start(GTK_BOX(bar), priv->find_area,
FALSE, FALSE, 0);

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,78 @@
$OpenBSD: patch-src_widget_kz-entry_h,v 1.1 2009/10/11 20:33:00 landry Exp $
--- src/widget/kz-entry.h.orig Tue Oct 28 16:09:13 2008
+++ src/widget/kz-entry.h Sun Oct 11 21:34:08 2009
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2004 Hiroyuki Ikezoe
@@ -35,56 +35,32 @@ G_BEGIN_DECLS
typedef struct _KzEntry KzEntry;
typedef struct _KzEntryClass KzEntryClass;
-typedef enum
-{
- KZ_ENTRY_ICON_EMPTY,
- KZ_ENTRY_ICON_PIXBUF,
- KZ_ENTRY_ICON_STOCK
-} KzEntryIconType;
-
-
struct _KzEntry
{
- GtkEntry parent;
- gchar *backtext;
-
- KzEntryIconType icon_type;
-
- GdkWindow *icon_area;
- GdkPixbuf *pixbuf;
+ GtkEntry parent;
+ gchar *background_text;
- gchar *stock_id;
- GtkIconSize icon_size;
-
- gint icon_width;
- gint icon_height;
-
- gboolean with_arrow;
- gboolean from_outside;
+ gboolean with_arrow;
};
struct _KzEntryClass
{
- GtkEntryClass parent_class;
- /* signals */
- void (*icon_pressed) (KzEntry *entry, GdkEventButton *event);
+ GtkEntryClass parent_class;
};
GType kz_entry_get_type (void) G_GNUC_CONST;
GtkWidget *kz_entry_new (void);
-GtkWidget *kz_entry_new_with_stock (const gchar *stock_id, GtkIconSize size);
void kz_entry_set_arrow (KzEntry *entry,
- gboolean arrow);
-void kz_entry_set_backtext (KzEntry *entry,
- const gchar *text);
-void kz_entry_set_icon_from_stock (KzEntry *entry,
- const gchar *stock_id,
- GtkIconSize size);
-void kz_entry_set_icon_from_pixbuf (KzEntry *entry,
- GdkPixbuf *icon);
-G_CONST_RETURN gchar* kz_entry_get_backtext (KzEntry *entry);
+ gboolean arrow);
+void kz_entry_set_backtext (KzEntry *entry,
+ const gchar *text);
+G_CONST_RETURN gchar* kz_entry_get_backtext
+ (KzEntry *entry);
G_END_DECLS
#endif /* __KZ_ENTRY_H__ */
+/*
+vi:ts=4:nowrap:ai:expandtab:sw=4
+*/