aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-10 02:27:34 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-10 02:27:34 +0800
commit5596836e1b87d5ddf6f9ad787a52ed8fecb472a2 (patch)
tree604de776c2e8d484b7e686b037f26fa65b4e4fcc /src/ephy-shell.c
parent04a1fdf7f7f19cfc777588b52ffffd0d009affb4 (diff)
downloadgsoc2013-epiphany-5596836e1b87d5ddf6f9ad787a52ed8fecb472a2.tar.gz
gsoc2013-epiphany-5596836e1b87d5ddf6f9ad787a52ed8fecb472a2.tar.zst
gsoc2013-epiphany-5596836e1b87d5ddf6f9ad787a52ed8fecb472a2.zip
Remove DBUS define, it's always compiled now.
2005-10-09 Christian Persch <chpe@cvs.gnome.org> * src/ephy-shell.c: Remove DBUS define, it's always compiled now.
Diffstat (limited to 'src/ephy-shell.c')
-rw-r--r--src/ephy-shell.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 24c2e623c..d1144f816 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -47,10 +47,7 @@
#include "print-dialog.h"
#include "ephy-prefs.h"
#include "ephy-gui.h"
-
-#ifdef ENABLE_DBUS
#include "ephy-dbus.h"
-#endif
#include <string.h>
#include <bonobo/bonobo-main.h>
@@ -551,14 +548,12 @@ ephy_shell_dispose (GObject *object)
priv->extensions_manager = NULL;
}
-#ifdef ENABLE_DBUS
if (priv->dbus_service != NULL)
{
LOG ("Shutting down DBUS service");
g_object_unref (priv->dbus_service);
priv->dbus_service = NULL;
}
-#endif
if (priv->session != NULL)
{
@@ -651,7 +646,7 @@ ephy_shell_finalize (GObject *object)
EphyShell *
ephy_shell_get_default (void)
{
- return ephy_shell;
+ return ephy_shell;
}
EphyShell *
@@ -1091,7 +1086,6 @@ ephy_shell_get_print_setup_dialog (EphyShell *shell)
return shell->priv->print_setup_dialog;
}
-#ifdef ENABLE_DBUS
GObject *
ephy_shell_get_dbus_service (EphyShell *shell)
{
@@ -1105,4 +1099,3 @@ ephy_shell_get_dbus_service (EphyShell *shell)
return G_OBJECT (shell->priv->dbus_service);
}
-#endif