summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <micke@codefactory.se>2001-10-29 13:27:05 +0000
committerMikael Hallendal <hallski@src.gnome.org>2001-10-29 13:27:05 +0000
commit40acd65fcb28e070bfd23a8f0b68f4e5b9f1cca3 (patch)
tree82a24351aff6f0d79384f565270ea3cc3a3cf355
parent982875bf550459aed8e7ebd9f3ec383a4f762181 (diff)
downloadyelp-40acd65fcb28e070bfd23a8f0b68f4e5b9f1cca3.tar.gz
if argument is passed, pass that argument to yelp_window_open_uri.
2001-10-29 Mikael Hallendal <micke@codefactory.se> * src/main.c (main): if argument is passed, pass that argument to yelp_window_open_uri. * src/yelp-window.[ch] (yelp_window_open_uri): added/impl.
-rw-r--r--ChangeLog7
-rw-r--r--src/main.c7
-rw-r--r--src/yelp-window.c18
-rw-r--r--src/yelp-window.h5
4 files changed, 35 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b4cb701..bed814a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-29 Mikael Hallendal <micke@codefactory.se>
+
+ * src/main.c (main): if argument is passed, pass that argument to
+ yelp_window_open_uri.
+
+ * src/yelp-window.c (yelp_window_open_uri): added/impl.
+
2001-10-28 Mikael Hallendal <micke@codefactory.se>
* src/yelp-window.c (yelp_window_uri_selected_cb): don't segfault
diff --git a/src/main.c b/src/main.c
index 18a3e994..c94e926b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,11 +46,16 @@ main (int argc, char **argv)
argc, argv, NULL);
/* gtk_init (&argc, &argv); */
+
gnome_vfs_init ();
base = yelp_base_new ();
-
+
window = yelp_base_new_window (base);
+
+ if (argc >= 2) {
+ yelp_window_open_uri (window, argv[1]);
+ }
gtk_widget_show_all (window);
diff --git a/src/yelp-window.c b/src/yelp-window.c
index a96aaf61..cc011e7e 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -339,3 +339,21 @@ yelp_window_new (YelpBase *base)
return GTK_WIDGET (window);
}
+void
+yelp_window_open_uri (YelpWindow *window,
+ const gchar *str_uri)
+{
+ YelpWindowPriv *priv;
+ GnomeVFSURI *uri;
+
+ g_return_if_fail (YELP_IS_WINDOW (window));
+
+ priv = window->priv;
+
+ gtk_entry_set_text (GTK_ENTRY (priv->uri_entry), str_uri);
+
+ uri = gnome_vfs_uri_new (str_uri);
+ yelp_view_open_uri (YELP_VIEW (priv->yelp_view), uri);
+ gnome_vfs_uri_unref (uri);
+}
+
diff --git a/src/yelp-window.h b/src/yelp-window.h
index 5991de21..9b82d0e8 100644
--- a/src/yelp-window.h
+++ b/src/yelp-window.h
@@ -53,6 +53,9 @@ struct _YelpWindowClass
};
GType yelp_window_get_type (void);
-GtkWidget * yelp_window_new (YelpBase *base);
+GtkWidget * yelp_window_new (YelpBase *base);
+
+void yelp_window_open_uri (YelpWindow *window,
+ const gchar *str_uri);
#endif /* __YELP_WINDOW_H__ */