Skip to content
Permalink
Browse files

Add for support for, and enable GTK3 as default.

GTK2 is still supported.  To build against GTK2, use:

$ GTK_VERSION=gtk2 make
  • Loading branch information...
jrick committed Jul 9, 2012
1 parent af187ae commit 1132d68aa111a6ae3eb3df093811791415f2bdcc
Showing with 316 additions and 28 deletions.
  1. +8 −0 Makefile
  2. +2 −0 completion.c
  3. +211 −28 xombrero.c
  4. +89 −0 xombrero.css
  5. +6 −0 xombrero.h
@@ -10,10 +10,17 @@ SRCS= cookie.c inspector.c marco.c about.c whitelist.c settings.c inputfocus.c
SRCS+= history.c completion.c tldlist.c externaleditor.c unix.c xombrero.c
CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused
CFLAGS+= -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare ${DEBUG}
CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
CFLAGS+= -I. -I${.CURDIR}
LDADD= -lutil -lgcrypt
GTK_VERSION ?= gtk3
.if ${GTK_VERSION} == "gtk2"
LIBS+= gtk+-2.0
LIBS+= webkit-1.0
.else
LIBS+= gtk+-3.0
LIBS+= webkitgtk-3.0
.endif
LIBS+= libsoup-2.4
LIBS+= gnutls
LIBS+= gthread-2.0
@@ -46,6 +53,7 @@ beforeinstall:
install -m 755 -d ${PREFIX}/bin
install -m 755 -d ${PREFIX}/man/man1/
install -m 755 -d ${PREFIX}/share/xombrero
install -m 644 $(.CURDIR)/xombrero.css ${PREFIX}/share/xombrero
install -m 644 ${.CURDIR}/xombreroicon.png ${PREFIX}/share/xombrero
install -m 644 ${.CURDIR}/xombreroicon16.png ${PREFIX}/share/xombrero
install -m 644 ${.CURDIR}/xombreroicon32.png ${PREFIX}/share/xombrero
@@ -27,6 +27,7 @@ completion_select_cb(GtkEntryCompletion *widget, GtkTreeModel *model,
{
gchar *value;

/* XXX may require changes for GTK3 */
gtk_tree_model_get(model, iter, 0, &value, -1);
load_uri(t, value);
g_free(value);
@@ -40,6 +41,7 @@ completion_hover_cb(GtkEntryCompletion *widget, GtkTreeModel *model,
{
gchar *value;

/* XXX may require changes for GTK3 */
gtk_tree_model_get(model, iter, 0, &value, -1);
gtk_entry_set_text(GTK_ENTRY(t->uri_entry), value);
gtk_editable_set_position(GTK_EDITABLE(t->uri_entry), -1);
Oops, something went wrong.

0 comments on commit 1132d68

Please sign in to comment.
You can’t perform that action at this time.