diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-03 05:34:53 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-03 05:34:53 +0800 |
| commit | c13881a0251b12e7c0d9bfc02a30d3d2b413725c (patch) | |
| tree | abc13b4b5ed11544526f4c1242528a4d0d196c6f /lib/ephy-file-helpers.c | |
| parent | 6dabfeeef03a5890d0ebffab4382ade94f6b7c32 (diff) | |
| download | gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.gz gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.zst gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.zip | |
R data/GNOME_Epiphany_Automation.server.in: A data/epiphany-service.xml: A
2006-01-02 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
* autogen.sh:
* configure.ac:
R data/GNOME_Epiphany_Automation.server.in:
* data/Makefile.am:
A data/epiphany-service.xml:
A data/org.gnome.Epiphany.service.in:
* doc/reference/Makefile.am:
R idl/.cvsignore:
R idl/EphyAutomation.idl:
R idl/Makefile.am:
* lib/Makefile.am:
R lib/ephy-dbus.c:
R lib/ephy-dbus.h:
* lib/ephy-file-helpers.c: (ephy_file_launch_application):
* src/Makefile.am:
A src/ephy-activation.c:
A src/ephy-activation.h:
A src/ephy-dbus.c:
A src/ephy-dbus.h:
* src/ephy-main.c: (main):
* src/ephy-shell.c: (ephy_shell_init), (open_urls),
(dbus_g_proxy_finalized_cb), (ephy_shell_startup),
(ephy_shell_dispose):
Bonobo is dead; long live the Bonobos!
Patch by Gustavo Gama, bug #322463.
Diffstat (limited to 'lib/ephy-file-helpers.c')
| -rw-r--r-- | lib/ephy-file-helpers.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c index 6f1472654..f9a665db9 100644 --- a/lib/ephy-file-helpers.c +++ b/lib/ephy-file-helpers.c @@ -43,12 +43,10 @@ #undef GNOME_DISABLE_DEPRECATED #include <libgnome/gnome-desktop-item.h> -#ifdef HAVE_STARTUP_NOTIFICATION #define SN_API_NOT_YET_FROZEN #include <libsn/sn.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> -#endif #define EPHY_UUID "0d82d98f-7079-401c-abff-203fcde1ece3" #define EPHY_UUID_ENVVAR "EPHY_UNIQUE" @@ -560,7 +558,6 @@ my_gdk_spawn_make_environment_for_screen (GdkScreen *screen, return retval; } -#ifdef HAVE_STARTUP_NOTIFICATION static void sn_error_trap_push (SnDisplay *display, Display *xdisplay) @@ -728,8 +725,6 @@ add_startup_timeout (GdkScreen *screen, } } -#endif /* HAVE_STARTUP_NOTIFICATION */ - gboolean ephy_file_launch_application (GnomeVFSMimeApplication *application, const char *parameter, @@ -740,10 +735,8 @@ ephy_file_launch_application (GnomeVFSMimeApplication *application, char *uri; char **envp; GnomeVFSResult result; -#ifdef HAVE_STARTUP_NOTIFICATION SnLauncherContext *sn_context; SnDisplay *sn_display; -#endif g_return_val_if_fail (application != NULL, FALSE); g_return_val_if_fail (parameter != NULL, FALSE); @@ -756,7 +749,6 @@ ephy_file_launch_application (GnomeVFSMimeApplication *application, screen = gdk_screen_get_default (); envp = my_gdk_spawn_make_environment_for_screen (screen, NULL); -#ifdef HAVE_STARTUP_NOTIFICATION sn_display = sn_display_new (gdk_display, sn_error_trap_push, sn_error_trap_pop); @@ -807,11 +799,9 @@ ephy_file_launch_application (GnomeVFSMimeApplication *application, } else { sn_context = NULL; } -#endif /* HAVE_STARTUP_NOTIFICATION */ result = gnome_vfs_mime_application_launch_with_env (application, uris, envp); -#ifdef HAVE_STARTUP_NOTIFICATION if (sn_context != NULL) { if (result != GNOME_VFS_OK) { sn_launcher_context_complete (sn_context); /* end sequence */ @@ -824,7 +814,6 @@ ephy_file_launch_application (GnomeVFSMimeApplication *application, } sn_display_unref (sn_display); -#endif /* HAVE_STARTUP_NOTIFICATION */ g_strfreev (envp); g_list_foreach (uris, (GFunc) g_free,NULL); |