summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <micke@codefactory.se>2002-03-03 01:44:52 +0000
committerMikael Hallendal <hallski@src.gnome.org>2002-03-03 01:44:52 +0000
commit36b12b07405ec21478aad56ca71d47172f83289f (patch)
tree0e1dca30caf4d509c3d8b47521f3eafee8ad3c32
parent8d0265d777cd68c75efbfd9e42267711902a90dc (diff)
downloadyelp-36b12b07405ec21478aad56ca71d47172f83289f.tar.gz
- Fixed #67954 (yvi_html_url_selected_cb): implemented.
2002-03-03 Mikael Hallendal <micke@codefactory.se> * src/yelp-view-index.c: - Fixed #67954 (yvi_html_url_selected_cb): implemented. (yelp_view_index_show_uri): fixed compile warning.
-rw-r--r--ChangeLog5
-rw-r--r--src/yelp-view-index.c25
2 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 79939b28..1943fcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-03-03 Mikael Hallendal <micke@codefactory.se>
+ * src/yelp-view-index.c:
+ - Fixed #67954
+ (yvi_html_url_selected_cb): implemented.
+ (yelp_view_index_show_uri): fixed compile warning.
+
* src/yelp-window.c:
(yw_handle_url): check if url starts with index:, if so, let
YelpViewIndex handle it.
diff --git a/src/yelp-view-index.c b/src/yelp-view-index.c
index ff2b5812..727b69c4 100644
--- a/src/yelp-view-index.c
+++ b/src/yelp-view-index.c
@@ -37,10 +37,11 @@ static void yvi_init (YelpViewIndex *view);
static void yvi_class_init (YelpViewIndexClass *klass);
static void yvi_index_selection_changed_cb (GtkTreeSelection *selection,
YelpViewIndex *content);
-static void yvi_html_url_selected_cb (YelpViewIndex *content,
+static void yvi_html_url_selected_cb (YelpHtml *html,
char *url,
char *base_url,
- gboolean handled);
+ gboolean handled,
+ YelpViewIndex *view);
static void yvi_entry_changed_cb (GtkEntry *entry,
YelpViewIndex *view);
static void yvi_entry_activated_cb (GtkEntry *entry,
@@ -172,16 +173,22 @@ yvi_index_selection_changed_cb (GtkTreeSelection *selection,
}
static void
-yvi_html_url_selected_cb (YelpViewIndex *content,
+yvi_html_url_selected_cb (YelpHtml *html,
char *url,
char *base_url,
- gboolean handled)
+ gboolean handled,
+ YelpViewIndex *view)
{
- g_return_if_fail (YELP_IS_VIEW_INDEX (content));
-
- /* TODO: What to do here? */
+ gchar *real_base_url;
- /* FIXME: Emit section_selected?? */
+ g_return_if_fail (YELP_IS_VIEW_INDEX (view));
+
+ real_base_url = g_strconcat ("index:", base_url, NULL);
+
+ g_signal_emit (view, signals[URL_SELECTED], 0,
+ url, real_base_url, handled);
+
+ g_free (real_base_url);
}
static void
@@ -389,7 +396,7 @@ void
yelp_view_index_show_uri (YelpViewIndex *view, const gchar *uri)
{
YelpViewIndexPriv *priv;
- gchar *real_uri;
+ const gchar *real_uri;
g_return_if_fail (YELP_IS_VIEW_INDEX (view));
g_return_if_fail (uri != NULL);