aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-31 05:58:56 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-31 05:58:56 +0800
commit6bf566c5b05b4a8adf46cb19b7e939772ea9e001 (patch)
tree8a82b3ed48c5823918c3056c09866b0a084d4bd6
parent76483001e27ea8965f86ae420fb6d4d20f246785 (diff)
downloadgsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar.gz
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar.bz2
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar.lz
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar.xz
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.tar.zst
gsoc2013-epiphany-6bf566c5b05b4a8adf46cb19b7e939772ea9e001.zip
Idle unref the dbus proxy in case we didn't call any remote methods; and
2006-01-30 Christian Persch <chpe@cvs.gnome.org> * src/ephy-main.c: (open_urls), (call_dbus_proxy): Idle unref the dbus proxy in case we didn't call any remote methods; and ref the dbus proxy for each call + one idle unref for each URL remoted.
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-main.c15
2 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 46f55ecd7..ce4e248d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-30 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-main.c: (open_urls), (call_dbus_proxy):
+
+ Idle unref the dbus proxy in case we didn't call any remote
+ methods; and ref the dbus proxy for each call + one idle unref
+ for each URL remoted.
+
2006-01-30 Crispin Flowerday <gnome@flowerday.cx>
* src/bookmarks/ephy-bookmark-properties.c: (update_warning),
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 881d58b9c..7ee41baae 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -370,11 +370,8 @@ open_urls (DBusGProxy *proxy,
guint32 user_time,
GError **error)
{
- EphyShell *shell;
const char *options = "new-window";
int i;
-
- shell = ephy_shell_get_default ();
if (open_in_new_window)
{
@@ -399,17 +396,21 @@ open_urls (DBusGProxy *proxy,
char *path;
path = remaining_arguments[i];
- //path = path_from_command_line_arg (args[i]);
+ /* path = path_from_command_line_arg (args[i]); */
+
+ g_object_ref (proxy);
org_gnome_Epiphany_load_url_async
(proxy, path, options, user_time,
unref_proxy_reply_cb, NULL /* FIXME */);
- //g_free (path);
+ /* g_free (path); */
}
g_strfreev (remaining_arguments);
remaining_arguments = NULL;
+
+ ephy_object_idle_unref (proxy);
}
return TRUE;
@@ -448,6 +449,10 @@ call_dbus_proxy (DBusGProxy *proxy,
{
retval = open_urls (proxy, user_time, error);
}
+ else
+ {
+ ephy_object_idle_unref (proxy);
+ }
}
/* FIXME why? */