diff options
| author | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-01-15 04:26:23 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-01-15 04:26:23 +0800 |
| commit | fb8e45c04b50563e4b3a752af8b357925dd1b83b (patch) | |
| tree | 17c27b6cfa32bf5160acd3d8f178c981ad31fb4b /embed | |
| parent | bf67cfd6ac01107cd4d400a604ccd76b41dfb48e (diff) | |
| download | gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar.gz gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar.bz2 gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar.lz gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar.xz gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.tar.zst gsoc2013-epiphany-fb8e45c04b50563e4b3a752af8b357925dd1b83b.zip | |
Update to new glib 2.15.2 API, bump glib dep and remove a
remaining gnome-vfs bit from configure.ac.
svn path=/trunk/; revision=7864
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/ephy-base-embed.c | 4 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 3 | ||||
| -rw-r--r-- | embed/xulrunner/embed/mozilla-embed-single.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/embed/ephy-base-embed.c b/embed/ephy-base-embed.c index 4d57c496c..802f8c15e 100644 --- a/embed/ephy-base-embed.c +++ b/embed/ephy-base-embed.c @@ -1397,7 +1397,7 @@ ephy_base_embed_update_file_monitor (EphyBaseEmbed *embed, g_object_unref (file_info); if (file_type == G_FILE_TYPE_DIRECTORY) { - monitor = g_file_monitor_directory (file, 0, NULL); + monitor = g_file_monitor_directory (file, 0, NULL, NULL); g_signal_connect (monitor, "changed", G_CALLBACK (ephy_base_embed_file_monitor_cb), embed); @@ -1405,7 +1405,7 @@ ephy_base_embed_update_file_monitor (EphyBaseEmbed *embed, LOG ("Installed monitor for directory '%s'", address); } else if (file_type == G_FILE_TYPE_REGULAR) { - monitor = g_file_monitor_file (file, 0, NULL); + monitor = g_file_monitor_file (file, 0, NULL, NULL); g_signal_connect (monitor, "changed", G_CALLBACK (ephy_base_embed_file_monitor_cb), embed); diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 05f081fac..79b513c29 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -516,7 +516,8 @@ user_css_enabled_notify (GConfClient *client, g_assert (priv->user_css_file_monitor == NULL); priv->user_css_file_monitor = g_file_monitor_file (file, - G_FILE_MONITOR_NONE, NULL); + G_FILE_MONITOR_NONE, + NULL, NULL); g_file_monitor_set_rate_limit (priv->user_css_file_monitor, USER_CSS_LOAD_DELAY); g_signal_connect (priv->user_css_file_monitor, "changed", diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp index 437d656bf..d5c3974e2 100644 --- a/embed/xulrunner/embed/mozilla-embed-single.cpp +++ b/embed/xulrunner/embed/mozilla-embed-single.cpp @@ -511,7 +511,8 @@ user_css_enabled_notify (GConfClient *client, g_assert (priv->user_css_file_monitor == NULL); priv->user_css_file_monitor = g_file_monitor_file (file, - G_FILE_MONITOR_NONE, NULL); + G_FILE_MONITOR_NONE, + NULL, NULL); g_file_monitor_set_rate_limit (priv->user_css_file_monitor, USER_CSS_LOAD_DELAY); g_signal_connect (priv->user_css_file_monitor, "changed", |