debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Require Gtk 2.10 and don't treat GIO specially anymore

Browse source
This commit is contained in:
Christian Dywan 2008-10-20 00:41:52 +02:00
parent 7f8fc2b31d
commit e848d1df6e
15 changed files with 31 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README
View file

@ -12,9 +12,9 @@ Midori is a lightweight web browser.
* Extensible via Javascript. * Extensible via Javascript.
* Custom context menu actions. * Custom context menu actions.
Requirements: GTK+ 2.6, WebkitGtk, libXML2 Requirements: GTK+ 2.10, WebkitGtk, libXML2
Optional: Glib 2.16, GtkSourceView 2.0, Unique 0.9, sqlite 3.0, xdg-open Optional: Unique 0.9, libsoup 2.4, sqlite 3.0, xdg-open
For installation instructions read INSTALL. For installation instructions read INSTALL.

8
configure.in
View file

@ -45,14 +45,8 @@ AC_SUBST(UNIQUE_CFLAGS)
AC_SUBST(UNIQUE_LIBS) AC_SUBST(UNIQUE_LIBS)
AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available]) AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available])
# Checks for GIO2
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=1, have_gio=0)
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
AC_DEFINE_UNQUOTED(HAVE_GIO,$have_gio, [Whether GIO is available])
# Checks for Gtk+2 # Checks for Gtk+2
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=1, have_gtk=0) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10, have_gtk=1, have_gtk=0)
if test "x${have_gtk}" = "xfalse" ; then if test "x${have_gtk}" = "xfalse" ; then
AC_MSG_ERROR([No Gtk+2 package information found]) AC_MSG_ERROR([No Gtk+2 package information found])
fi fi

6
midori/Makefile.am
View file

@ -2,9 +2,8 @@
INCLUDES = \ INCLUDES = \
$(UNIQUE_CFLAGS) \ $(UNIQUE_CFLAGS) \
$(GIO_CFLAGS) \ $(SQLITE3_CFLAGS) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
$(WEBKIT_CFLAGS) \ $(WEBKIT_CFLAGS) \
-I../katze -I../katze
@ -12,9 +11,8 @@ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\"
LDADD = \ LDADD = \
$(UNIQUE_LIBS) \ $(UNIQUE_LIBS) \
$(GIO_LIBS) \ $(SQLITE3_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(GTKSOURCEVIEW_LIBS)\
$(WEBKIT_LIBS) \ $(WEBKIT_LIBS) \
$(INTLLIBS) \ $(INTLLIBS) \
../katze/libkatze.la ../katze/libkatze.la

2
midori/compat.c
View file

@ -31,7 +31,7 @@ g_strcmp0 (const gchar* string1,
#if !GTK_CHECK_VERSION(2, 14, 0) #if !GTK_CHECK_VERSION(2, 14, 0)
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
/* GTK+/ GdkPixbuf internal helper function /* GTK+/ GdkPixbuf internal helper function
Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com> Copyright (C) 2008 Matthias Clasen <mclasen@redhat.com>

9
midori/compat.h
View file

@ -16,14 +16,15 @@
#include <config.h> #include <config.h>
#endif #endif
#if HAVE_GIO #include <glib.h>
#if GLIB_CHECK_VERSION (2, 16, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif #endif
#include <webkit/webkit.h> #include <webkit/webkit.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#if !GLIB_CHECK_VERSION(2, 16, 0) #if !GLIB_CHECK_VERSION (2, 16, 0)
gint gint
g_strcmp0 (const gchar* string1, g_strcmp0 (const gchar* string1,
@ -31,9 +32,9 @@ g_strcmp0 (const gchar* string1,
#endif #endif
#if !GTK_CHECK_VERSION(2, 14, 0) #if !GTK_CHECK_VERSION (2, 14, 0)
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
GdkPixbuf* GdkPixbuf*
gdk_pixbuf_new_from_stream (GInputStream* stream, gdk_pixbuf_new_from_stream (GInputStream* stream,

14
midori/gtkiconentry.c
View file

@ -61,7 +61,7 @@ typedef struct
GdkCursorType cursor_type; GdkCursorType cursor_type;
gboolean custom_cursor; gboolean custom_cursor;
GtkImageType storage_type; GtkImageType storage_type;
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
GIcon *gicon; GIcon *gicon;
#endif #endif
gchar *icon_name; gchar *icon_name;
@ -274,7 +274,7 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass)
NULL, NULL,
GTK_PARAM_WRITABLE)); GTK_PARAM_WRITABLE));
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_GICON_PRIMARY, PROP_GICON_PRIMARY,
g_param_spec_object ("gicon-primary", g_param_spec_object ("gicon-primary",
@ -433,7 +433,7 @@ gtk_icon_entry_set_property (GObject *object,
g_value_get_string (value)); g_value_get_string (value));
break; break;
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
case PROP_GICON_PRIMARY: case PROP_GICON_PRIMARY:
gtk_icon_entry_set_icon_from_gicon (entry, gtk_icon_entry_set_icon_from_gicon (entry,
GTK_ICON_ENTRY_PRIMARY, GTK_ICON_ENTRY_PRIMARY,
@ -471,7 +471,7 @@ gtk_icon_entry_get_property (GObject *object,
GTK_ICON_ENTRY_SECONDARY)); GTK_ICON_ENTRY_SECONDARY));
break; break;
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
case PROP_GICON_PRIMARY: case PROP_GICON_PRIMARY:
g_value_set_object (value, g_value_set_object (value,
gtk_icon_entry_get_gicon (entry, gtk_icon_entry_get_gicon (entry,
@ -1104,7 +1104,7 @@ icon_theme_changed (GtkIconEntry *entry)
gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name);
} }
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON)
{ {
g_object_unref (priv->icons[i].pixbuf); g_object_unref (priv->icons[i].pixbuf);
@ -1339,7 +1339,7 @@ gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry,
* appropriately. * appropriately.
*/ */
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
void void
gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry,
GtkIconEntryPosition icon_pos, GtkIconEntryPosition icon_pos,
@ -1493,7 +1493,7 @@ gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry,
*/ */
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
GIcon * GIcon *
gtk_icon_entry_get_gicon (const GtkIconEntry *entry, gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
GtkIconEntryPosition icon_pos) GtkIconEntryPosition icon_pos)

6
midori/gtkiconentry.h
View file

@ -26,7 +26,7 @@
#endif #endif
#include <glib.h> #include <glib.h>
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif #endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -86,14 +86,14 @@ void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry,
GtkIconEntryPosition icon_pos, GtkIconEntryPosition icon_pos,
const gchar *icon_name); const gchar *icon_name);
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry,
GtkIconEntryPosition icon_pos, GtkIconEntryPosition icon_pos,
GIcon *icon); GIcon *icon);
#endif #endif
GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry,
GtkIconEntryPosition icon_pos); GtkIconEntryPosition icon_pos);
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
GtkIconEntryPosition icon_pos); GtkIconEntryPosition icon_pos);
#endif #endif

7
midori/main.c
View file

@ -84,13 +84,6 @@ stock_items_init (void)
{ STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE },
{ STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" },
{ STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD },
#if !GTK_CHECK_VERSION(2, 10, 0)
{ GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, NULL },
#endif
#if !GTK_CHECK_VERSION(2, 8, 0)
{ GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL },
{ GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL },
#endif
}; };
GtkIconSource* icon_source; GtkIconSource* icon_source;

10
midori/midori-addons.c
View file

@ -24,7 +24,7 @@
#include <JavaScriptCore/JavaScript.h> #include <JavaScriptCore/JavaScript.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <string.h> #include <string.h>
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif #endif
@ -313,7 +313,7 @@ _addons_toggle_disable_button (MidoriAddons* addons,
gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive);
} }
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
static void static void
midori_addons_directory_monitor_changed (GFileMonitor* monitor, midori_addons_directory_monitor_changed (GFileMonitor* monitor,
GFile* child, GFile* child,
@ -398,7 +398,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem,
_addons_get_folder (addons)); _addons_get_folder (addons));
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
#if !HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
/* FIXME: Without GIO clicking this button is the only /* FIXME: Without GIO clicking this button is the only
way to update the list */ way to update the list */
midori_addons_update_elements (addons); midori_addons_update_elements (addons);
@ -890,7 +890,7 @@ midori_addons_new (GtkWidget* web_widget,
MidoriAddonKind kind) MidoriAddonKind kind)
{ {
MidoriAddons* addons; MidoriAddons* addons;
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
GSList* directories; GSList* directories;
GSList* list; GSList* list;
GFile* directory; GFile* directory;
@ -907,7 +907,7 @@ midori_addons_new (GtkWidget* web_widget,
midori_addons_set_kind (addons, kind); midori_addons_set_kind (addons, kind);
midori_addons_update_elements (addons); midori_addons_update_elements (addons);
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
directories = _addons_get_directories (addons); directories = _addons_get_directories (addons);
list = directories; list = directories;
while (directories) while (directories)

2
midori/midori-browser.c
View file

@ -807,12 +807,10 @@ _midori_browser_add_tab (MidoriBrowser* browser,
gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), view, gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), view,
tab_label); tab_label);
#if GTK_CHECK_VERSION(2, 10, 0)
gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook),
view, TRUE); view, TRUE);
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook), gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook),
view, TRUE); view, TRUE);
#endif
/* We want the tab to be removed if the widget is destroyed */ /* We want the tab to be removed if the widget is destroyed */
g_signal_connect (view, "destroy", g_signal_connect (view, "destroy",

2
midori/midori-locationentry.c
View file

@ -70,7 +70,7 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class)
G_TYPE_INT); G_TYPE_INT);
} }
#define HAVE_ENTRY_PROGRESS GTK_CHECK_VERSION (2, 10, 0) #define HAVE_ENTRY_PROGRESS 1
#ifdef HAVE_ENTRY_PROGRESS #ifdef HAVE_ENTRY_PROGRESS

10
midori/midori-stock.h
View file

@ -47,14 +47,4 @@
#define STOCK_USER_TRASH "gnome-stock-trash" #define STOCK_USER_TRASH "gnome-stock-trash"
#define STOCK_WINDOW_NEW "stock_new-window" #define STOCK_WINDOW_NEW "stock_new-window"
/* For backwards compatibility */
#if !GTK_CHECK_VERSION(2, 10, 0)
#define GTK_STOCK_SELECT_ALL "gtk-select-all"
#endif
#if !GTK_CHECK_VERSION(2, 8, 0)
#define GTK_STOCK_FULLSCREEN "gtk-fullscreen"
#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
#endif
#endif /* !__MIDORI_STOCK_H__ */ #endif /* !__MIDORI_STOCK_H__ */

4
midori/midori-view.c
View file

@ -641,7 +641,7 @@ gjs_value_links_foreach_cb (GjsValue* link,
MidoriView* view) MidoriView* view)
{ {
const gchar* type; const gchar* type;
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
const gchar* rel; const gchar* rel;
GFile* icon_file; GFile* icon_file;
GIcon* icon; GIcon* icon;
@ -663,7 +663,7 @@ gjs_value_links_foreach_cb (GjsValue* link,
? gjs_value_get_attribute_string (link, "title") : NULL); ? gjs_value_get_attribute_string (link, "title") : NULL);
} }
} }
#if HAVE_GIO #if GLIB_CHECK_VERSION (2, 16, 0)
if (gjs_value_has_attribute (link, "rel")) if (gjs_value_has_attribute (link, "rel"))
{ {
rel = gjs_value_get_attribute_string (link, "rel"); rel = gjs_value_get_attribute_string (link, "rel");

2
midori/wscript_build
View file

@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program')
obj.target = 'midori' obj.target = 'midori'
obj.includes = '. ..' obj.includes = '. ..'
obj.find_sources_in_dirs ('.') obj.find_sources_in_dirs ('.')
obj.uselib = 'UNIQUE LIBSOUP GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' obj.uselib = 'UNIQUE LIBSOUP GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML'
obj.uselib_local = 'katze' obj.uselib_local = 'katze'

18
wscript
View file

@ -102,20 +102,6 @@ def configure (conf):
libsoup = 'no' libsoup = 'no'
conf.check_message_custom ('libsoup', 'support', libsoup) conf.check_message_custom ('libsoup', 'support', libsoup)
if not Params.g_options.disable_gio:
conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False)
gio = ['not available','yes'][conf.env['HAVE_GIO'] == 1]
else:
gio = 'no'
conf.check_message_custom ('GIO', 'support', gio)
if gio == 'yes':
if platform.system () != 'Windows':
if not conf.find_program ('gvfs-open'):
print '\tNote: There doesn\'t seem to be GVfs installed.'
print '\t The HTTP backend of GVfs is recommended for'
print '\t viewing source code and loading favicons.'
if not Params.g_options.disable_sqlite: if not Params.g_options.disable_sqlite:
conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False)
sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1]
@ -125,7 +111,7 @@ def configure (conf):
sqlite = 'no' sqlite = 'no'
conf.check_message_custom ('history database', 'support', sqlite) conf.check_message_custom ('history database', 'support', sqlite)
conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True)
conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True)
conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True)
@ -160,8 +146,6 @@ def set_options (opt):
help='Disables Unique support', dest='disable_unique') help='Disables Unique support', dest='disable_unique')
opt.add_option ('--disable-libsoup', action='store_true', default=False, opt.add_option ('--disable-libsoup', action='store_true', default=False,
help='Disables libsoup support', dest='disable_libsoup') help='Disables libsoup support', dest='disable_libsoup')
opt.add_option ('--disable-gio', action='store_true', default=False,
help='Disables GIO support', dest='disable_gio')
opt.add_option ('--disable-sqlite', action='store_true', default=False, opt.add_option ('--disable-sqlite', action='store_true', default=False,
help='Disables sqlite support', dest='disable_sqlite') help='Disables sqlite support', dest='disable_sqlite')