gtkhtml r9196 - in trunk: . components components/html-editor gtkhtml
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkhtml r9196 - in trunk: . components components/html-editor gtkhtml
- Date: Thu, 9 Apr 2009 03:13:09 +0000 (UTC)
Author: mbarnes
Date: Thu Apr 9 03:13:09 2009
New Revision: 9196
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=9196&view=rev
Log:
2009-04-08 Matthew Barnes <mbarnes redhat com>
** Fixes bug #571743
* Makefile.am:
* configure.in:
* gtkhtml.spec.in:
* components/Makefile.am:
* components/html-editor/*:
* gtkhtml/testgtkhtml.c:
Kill the deprecated html-editor component and remove any
trace of it from the build files. Buh bye, Bonobo.
Removed:
trunk/components/html-editor/
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/components/Makefile.am
trunk/configure.in
trunk/gtkhtml.spec.in
trunk/gtkhtml/testgtkhtml.c
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Apr 9 03:13:09 2009
@@ -45,5 +45,3 @@
intltool-extract.in \
intltool-update.in \
intltool-merge.in
-
-DISTCHECK_CONFIGURE_FLAGS = --with-bonobo-editor
Modified: trunk/components/Makefile.am
==============================================================================
--- trunk/components/Makefile.am (original)
+++ trunk/components/Makefile.am Thu Apr 9 03:13:09 2009
@@ -1,5 +1,2 @@
-if BONOBO_EDITOR
-BONOBO_EDITOR_SUBDIR = html-editor
-endif
-SUBDIRS = editor $(BONOBO_EDITOR_SUBDIR)
+SUBDIRS = editor
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Apr 9 03:13:09 2009
@@ -9,8 +9,6 @@
m4_define([gtk_minimum_version], [2.14.0])
m4_define([gail_minimum_version], [1.1.0])
m4_define([gnome_icon_theme_minimum_version], [2.22.0])
-m4_define([libbonobo_minimum_version], [2.20.3])
-m4_define([libbonoboui_minimum_version], [2.2.4])
m4_define([libglade_minimum_version], [2.0.0])
m4_define([libgnomeui_minimum_version], [2.0.0])
@@ -34,8 +32,6 @@
I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\""
AC_SUBST(I18N_LIB_CFLAGS)
-AC_DEFINE(BONOBO_DISABLE_DEPRECATED,1,[No deprecated bonobo functions])
-
AM_INIT_AUTOMAKE($PACKAGE, 3.26.1)
AM_MAINTAINER_MODE
@@ -91,19 +87,6 @@
AC_SUBST(GTKHTML_LIBS)
AC_SUBST(GTKHTML_MODULES)
-# Bonobo editor module
-AC_ARG_WITH(bonobo-editor,
- AC_HELP_STRING([--with-bonobo-editor],
- [build the older Bonobo-based editor [[default=no]]]),
- bonobo_editor="$withval", bonobo_editor="no")
-if test "x$bonobo_editor" = "xyes"; then
- EDITOR_MODULES="${GTKHTML_MODULES} libbonobo-2.0 >= libbonobo_minimum_version libbonoboui-2.0 >= libbonoboui_minimum_version"
- PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)
- AC_SUBST(EDITOR_CFLAGS)
- AC_SUBST(EDITOR_LIBS)
-fi
-AM_CONDITIONAL(BONOBO_EDITOR, test x$bonobo_editor = xyes)
-
# Glade catalog files
AC_ARG_WITH(glade-catalog,
AC_HELP_STRING([--with-glade-catalog],
@@ -116,8 +99,6 @@
AM_CONDITIONAL(GLADE_CATALOG, test x$glade_catalog = xyes)
# These are still needed for 'dist' targets.
-BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_IDL_INCLUDES)
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
@@ -229,7 +210,6 @@
gtkhtml/libgtkhtml.pc
a11y/Makefile
components/Makefile
-components/html-editor/Makefile
components/editor/Makefile
components/editor/gtkhtml-editor.pc
art/Makefile
Modified: trunk/gtkhtml.spec.in
==============================================================================
--- trunk/gtkhtml.spec.in (original)
+++ trunk/gtkhtml.spec.in Thu Apr 9 03:13:09 2009
@@ -13,7 +13,6 @@
Requires: gdk-pixbuf >= 0.8.0
Requires: gal >= 0.7.99.5
Requires: pspell
-Requires: bonobo >= 0.32
Requires: GConf >= 0.9
Requires: libghttp >= 1.0
Requires: libglade
@@ -41,15 +40,15 @@
# Needed for snapshot releases.
if [ ! -f configure ]; then
%ifarch alpha
- CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --with-bonobo
+ CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
%else
- CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --with-bonobo
+ CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
%endif
else
%ifarch alpha
- CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --with-bonobo
+ CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
%else
- CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --with-bonobo
+ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
%endif
fi
@@ -85,7 +84,6 @@
%{_bindir}/gnome-gtkhtml-editor
%{_bindir}/ebrowser
%{_libdir}/*.so.*
-%{_libdir}/bonobo/plugin/*so
%{_datadir}/control-center/Documents/*.desktop
%{_datadir}/control-center/capplets/*.desktop
%{_datadir}/gnome/apps/Settings/Documents/*.desktop
@@ -105,6 +103,4 @@
%{_libdir}/*.sh
%{_libdir}/*.so
%{_libdir}/*.a
-%{_libdir}/*.la
-#%{_libdir}/bonobo/plugin/*.a
-#%{_libdir}/bonobo/plugin/*.la
+%{_libdir}/*.la
\ No newline at end of file
Modified: trunk/gtkhtml/testgtkhtml.c
==============================================================================
--- trunk/gtkhtml/testgtkhtml.c (original)
+++ trunk/gtkhtml/testgtkhtml.c Thu Apr 9 03:13:09 2009
@@ -19,7 +19,6 @@
#include "config.h"
#include <glib/gi18n.h>
#include <gnome.h>
-#include <bonobo.h>
#include <sys/types.h>
#include <glib.h>
@@ -182,100 +181,92 @@
GNOMEUIINFO_END
};
-static void
-create_toolbars (GtkWidget *app)
+static GtkWidget *
+create_toolbars ()
{
- GtkWidget *dock;
- GtkWidget *hbox;
- GtkWidget *frame;
- GtkWidget *toolbar;
+ GtkWidget * label;
GtkToolItem *item;
- /* char *imgloc; */
-
- dock = bonobo_dock_item_new ("testgtkhtml-toolbar1",
- (BONOBO_DOCK_ITEM_BEH_EXCLUSIVE));
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (dock), hbox);
- gtk_container_set_border_width (GTK_CONTAINER (dock), 2);
-
- toolbar = gtk_toolbar_new ();
- gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
- gtk_box_pack_start (GTK_BOX (hbox), toolbar, FALSE, FALSE, 0);
-
- item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
- gtk_tool_item_set_tooltip_text (item, "Move back");
- g_signal_connect (item, "clicked", G_CALLBACK (back_cb), NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
- toolbar_back = GTK_WIDGET (item);
-
- item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
- gtk_tool_item_set_tooltip_text (item, "Move forward");
- g_signal_connect (item, "clicked", G_CALLBACK (forward_cb), NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
- toolbar_forward = GTK_WIDGET (item);
-
- item = gtk_separator_tool_item_new ();
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
- item = gtk_tool_button_new_from_stock (GTK_STOCK_STOP);
- gtk_tool_item_set_tooltip_text (item, "Stop loading");
- g_signal_connect (item, "clicked", G_CALLBACK (stop_cb), NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
- item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
- gtk_tool_item_set_tooltip_text (item, "Reload page");
- g_signal_connect (item, "clicked", G_CALLBACK (reload_cb), NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
- item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
- gtk_tool_item_set_tooltip_text (item, "Home page");
- g_signal_connect (item, "clicked", G_CALLBACK (home_cb), NULL);
-
- item = gtk_separator_tool_item_new ();
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
- /* animator = gnome_animator_new_with_size (32, 32);
-
- if (g_file_exists("32.png"))
- imgloc = "32.png";
- else if (g_file_exists(SRCDIR "/32.png"))
- imgloc = SRCDIR "/32.png";
- else
- imgloc = "32.png";
- gnome_animator_append_frames_from_file_at_size (GNOME_ANIMATOR (animator),
- imgloc,
- 0, 0,
- 25,
- 32,
- 32, 32); */
-
- frame = gtk_frame_new (NULL);
- /* TODO2 gtk_container_add (GTK_CONTAINER (frame), animator); */
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
- /* gnome_animator_set_loop_type (GNOME_ANIMATOR (animator),
- GNOME_ANIMATOR_LOOP_RESTART); */
- gtk_widget_show_all (dock);
- bonobo_dock_add_item (BONOBO_DOCK (GNOME_APP (app)->dock),
- BONOBO_DOCK_ITEM (dock), BONOBO_DOCK_TOP, 1, 0, 0, FALSE);
-
- /* Create the location bar */
- dock = bonobo_dock_item_new ("testgtkhtml-toolbar2",
- (BONOBO_DOCK_ITEM_BEH_EXCLUSIVE));
- hbox = gtk_hbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (dock), hbox);
- gtk_container_set_border_width (GTK_CONTAINER (dock), 2);
- gtk_box_pack_start (GTK_BOX (hbox),
- gtk_label_new ("Location:"), FALSE, FALSE, 0);
- entry = gtk_entry_new ();
- g_signal_connect (entry, "activate", G_CALLBACK (entry_goto_url), NULL);
- gtk_box_pack_start (GTK_BOX (hbox),
- entry, TRUE, TRUE, 0);
- bonobo_dock_add_item (BONOBO_DOCK (GNOME_APP (app)->dock),
- BONOBO_DOCK_ITEM (dock), BONOBO_DOCK_TOP, 2, 0, 0, FALSE);
+ GtkWidget * action_table = gtk_table_new (7, 1, FALSE);
+ {
+ item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+ gtk_tool_item_set_tooltip_text (item, "Move back");
+ g_signal_connect (item, "clicked", G_CALLBACK (back_cb), NULL);
+ gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
+ toolbar_back = GTK_WIDGET (item);
+ gtk_table_attach (GTK_TABLE (action_table),
+ GTK_WIDGET (item),
+ /* X direction */ /* Y direction */
+ 0, 1, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+ gtk_tool_item_set_tooltip_text (item, "Move forward");
+ g_signal_connect (item, "clicked", G_CALLBACK (forward_cb), NULL);
+ gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
+ toolbar_forward = GTK_WIDGET (item);
+ gtk_table_attach (GTK_TABLE (action_table),
+ GTK_WIDGET (item),
+ /* X direction */ /* Y direction */
+ 1, 2, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ item = gtk_tool_button_new_from_stock (GTK_STOCK_STOP);
+ gtk_tool_item_set_tooltip_text (item, "Stop loading");
+ g_signal_connect (item, "clicked", G_CALLBACK (stop_cb), NULL);
+ gtk_table_attach (GTK_TABLE (action_table),
+ GTK_WIDGET (item),
+ /* X direction */ /* Y direction */
+ 2, 3, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
+ gtk_tool_item_set_tooltip_text (item, "Reload page");
+ g_signal_connect (item, "clicked", G_CALLBACK (reload_cb), NULL);
+ gtk_table_attach (GTK_TABLE (action_table),
+ GTK_WIDGET (item),
+ /* X direction */ /* Y direction */
+ 3, 4, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+ gtk_tool_item_set_tooltip_text (item, "Home page");
+ g_signal_connect (item, "clicked", G_CALLBACK (home_cb), NULL);
+ gtk_table_attach (GTK_TABLE (action_table),
+ GTK_WIDGET (item),
+ /* X direction */ /* Y direction */
+ 4, 5, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ label = gtk_label_new ("Location:");
+ gtk_table_attach (GTK_TABLE (action_table),
+ label,
+ /* X direction */ /* Y direction */
+ 5, 6, 0, 1,
+ GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
+ }
+ {
+ entry = gtk_entry_new ();
+ g_signal_connect (entry, "activate", G_CALLBACK (entry_goto_url), NULL);
+ gtk_table_attach (GTK_TABLE (action_table),
+ entry,
+ /* X direction */ /* Y direction */
+ 6, 7, 0, 1,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+ 0, 0);
+ }
+ return action_table;
}
static gint page_num, pages;
@@ -1014,7 +1005,7 @@
gint
main (gint argc, gchar *argv[])
{
- GtkWidget *app, *bar;
+ GtkWidget *app, *bar, *main_table;
GtkWidget *html_widget;
GtkWidget *scrolled_window;
@@ -1032,7 +1023,6 @@
g_signal_connect (app, "delete_event", G_CALLBACK (exit_cb), NULL);
- create_toolbars (app);
bar = gnome_appbar_new (FALSE, TRUE, GNOME_PREFERENCES_USER);
gnome_app_set_statusbar (GNOME_APP (app), bar);
gnome_app_create_menus (GNOME_APP (app), main_menu);
@@ -1048,11 +1038,27 @@
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
- gnome_app_set_contents (GNOME_APP (app), scrolled_window);
+
+ main_table = gtk_table_new (1, 2, FALSE);
+ gnome_app_set_contents (GNOME_APP (app), main_table);
+ gtk_table_attach (GTK_TABLE (main_table),
+ scrolled_window,
+ /* X direction */ /* Y direction */
+ 0, 1, 1, 2,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+ 0, 0);
+ gtk_table_attach (GTK_TABLE (main_table),
+ create_toolbars (),
+ /* X direction */ /* Y direction */
+ 0, 1, 0, 1,
+ GTK_EXPAND | GTK_FILL, GTK_SHRINK,
+ 0, 0);
session = soup_session_async_new ();
+ SoupCookieJar * cookie_jar = soup_cookie_jar_text_new("./cookies.txt", FALSE);
+ soup_session_add_feature(session, SOUP_SESSION_FEATURE(cookie_jar));
+
html_widget = gtk_html_new ();
html = GTK_HTML (html_widget);
gtk_html_set_allow_frameset (html, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
