diff -urp gnobog-0.4.3/src/gnobog_bookmarks.c gnobog-0.4.3-dillo/src/gnobog_bookmarks.c --- gnobog-0.4.3/src/gnobog_bookmarks.c 2001-04-30 00:08:58.000000000 +0800 +++ gnobog-0.4.3-dillo/src/gnobog_bookmarks.c 2003-03-03 13:52:54.000000000 +0800 @@ -61,6 +61,7 @@ enum #define OPERA_IN_EXISTING_WINDOW_CL "opera %s" #define OPERA_IN_NEW_WINDOW_CL "opera -newwindow %s" #define LYNX_IN_NEW_WINDOW_CL "gnome-terminal -e 'lynx %s'" +#define DILLO_IN_NEW_WINDOW_CL "dillo %s" #define LINKS_IN_NEW_WINDOW_CL "gnome-terminal -e 'links %s'" #define GFTP_IN_NEW_WINDOW_CL "gftp %s" #define NCFTP_IN_NEW_WINDOW_CL "gnome-terminal -e 'ncftp %s'" @@ -85,6 +86,7 @@ static void gnobog_url_browse_in_gno static void gnobog_url_browse_in_nautilus (gchar* location, gboolean open_new_window); static void gnobog_url_browse_in_konqueror (gchar* location, gboolean open_new_window); static void gnobog_url_browse_in_opera (gchar* location, gboolean open_new_window); +static void gnobog_url_browse_in_dillo (gchar* location, gboolean open_new_window); static void gnobog_url_browse_in_lynx (gchar* location, gboolean open_new_window); static void gnobog_url_browse_in_links (gchar* location, gboolean open_new_window); static void gnobog_url_browse_in_gftp (gchar* location, gboolean open_new_window); @@ -1345,6 +1347,23 @@ gnobog_url_browse_in_opera (gchar* locat /* Do not call directly, use gnobog_bookmarks_node_view_in_browser () */ static void +gnobog_url_browse_in_dillo (gchar* location, + gboolean open_new_window) +{ + gchar* commandline; + + /* FIXME : Nothing works with Opera 4.0 Beta 1 */ +/* if (open_new_window == TRUE) { + commandline = g_strdup_printf (OPERA_IN_NEW_WINDOW_CL, location); + } else { + commandline = g_strdup_printf (OPERA_IN_EXISTING_WINDOW_CL, location); + }*/ + commandline = g_strdup_printf (DILLO_IN_NEW_WINDOW_CL, location); + gnobog_execute_command_line (commandline); + g_free (commandline); +} +/* Do not call directly, use gnobog_bookmarks_node_view_in_browser () */ +static void gnobog_url_browse_in_lynx (gchar* location, gboolean open_new_window) { @@ -1454,6 +1473,10 @@ gnobog_bookmarks_node_view_in_browser (G g_message ("Launch URL in Opera : %s", location); gnobog_url_browse_in_opera (location, open_new_window); break; + case DILLO_BROWSER: + g_message ("Launch URL in Dillo : %s", location); + gnobog_url_browse_in_dillo(location, open_new_window); + break; case LYNX_BROWSER: g_message ("Launch URL in Lynx : %s", location); gnobog_url_browse_in_lynx (location, open_new_window); diff -urp gnobog-0.4.3/src/gnobog_bookmarks.h gnobog-0.4.3-dillo/src/gnobog_bookmarks.h --- gnobog-0.4.3/src/gnobog_bookmarks.h 2000-11-03 05:36:18.000000000 +0800 +++ gnobog-0.4.3-dillo/src/gnobog_bookmarks.h 2003-03-03 13:53:02.000000000 +0800 @@ -70,6 +70,7 @@ typedef enum { NAUTILUS_BROWSER, KONQUEROR_BROWSER, OPERA_BROWSER, + DILLO_BROWSER, LYNX_BROWSER, LINKS_BROWSER, GFTP_BROWSER, diff -urp gnobog-0.4.3/src/gnobog_popup_menu.c gnobog-0.4.3-dillo/src/gnobog_popup_menu.c --- gnobog-0.4.3/src/gnobog_popup_menu.c 2001-05-03 22:07:12.000000000 +0800 +++ gnobog-0.4.3-dillo/src/gnobog_popup_menu.c 2003-03-03 13:53:58.000000000 +0800 @@ -70,6 +70,7 @@ static void gnobog_popup_cb_browse_in_na static void gnobog_popup_cb_browse_in_konqueror_new (GtkWidget* widget, gpointer data); static void gnobog_popup_cb_browse_in_opera_existing (GtkWidget* widget, gpointer data); static void gnobog_popup_cb_browse_in_opera_new (GtkWidget* widget, gpointer data); +static void gnobog_popup_cb_browse_in_dillo_new (GtkWidget* widget, gpointer data); static void gnobog_popup_cb_browse_in_lynx_new (GtkWidget* widget, gpointer data); static void gnobog_popup_cb_browse_in_links_new (GtkWidget* widget, gpointer data); static void gnobog_popup_cb_browse_in_gftp_new (GtkWidget* widget, gpointer data); @@ -119,6 +120,9 @@ browse_submenu [] = { GNOMEUIINFO_ITEM_NONE (N_("in Opera (new window)"), N_("Browse in Opera new window"), gnobog_popup_cb_browse_in_opera_new), + GNOMEUIINFO_ITEM_NONE (N_("in Dillo"), + N_("Browse in Dillo"), + gnobog_popup_cb_browse_in_dillo_new), GNOMEUIINFO_ITEM_NONE (N_("in Lynx"), N_("Browse in Lynx"), gnobog_popup_cb_browse_in_lynx_new), @@ -1225,6 +1229,29 @@ gnobog_popup_cb_browse_in_opera_new (Gtk } static void +gnobog_popup_cb_browse_in_dillo_new (GtkWidget* widget, + gpointer data) +{ + GnobogArborescence* arborescence; + GnobogBookmarksNode bookmarks_node; + GnobogBookmarks* bookmarks; + GList* list; + + arborescence = GNOBOG_ARBORESCENCE (gnobog_app_get_active_view ()); + + bookmarks = arborescence->bookmarks_watched; + + list = gnobog_arborescence_get_sorted_bookmarks_node_selection (arborescence); + if (list != NULL) { + bookmarks_node = list->data; + gnobog_bookmarks_node_view_in_browser (arborescence->bookmarks_watched, + bookmarks_node, + DILLO_BROWSER, + TRUE); + } +} + +static void gnobog_popup_cb_browse_in_lynx_new (GtkWidget* widget, gpointer data) {