[file-roller] Revert "Uses dbus-glib but doesn't check for it"
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Revert "Uses dbus-glib but doesn't check for it"
- Date: Thu, 8 Apr 2010 08:13:48 +0000 (UTC)
commit c8d375e1d07406b8c8b9cde48b9f4b6c2dad044a
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Apr 8 10:10:10 2010 +0200
Revert "Uses dbus-glib but doesn't check for it"
Wrong author in the commit.
This reverts commit eb72724883731cb965c97e4bc307ec3efc57a379.
src/dlg-package-installer.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c
index 3737883..6cf97bf 100644
--- a/src/dlg-package-installer.c
+++ b/src/dlg-package-installer.c
@@ -25,11 +25,7 @@
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-
-#ifdef ENABLE_PACKAGEKIT
#include <dbus/dbus-glib.h>
-#endif /* ENABLE_PACKAGEKIT */
-
#include "dlg-package-installer.h"
#include "gtk-utils.h"
#include "main.h"
@@ -80,7 +76,6 @@ package_installer_terminated (InstallerData *idata,
}
-#ifdef ENABLE_PACKAGEKIT
static void
packagekit_install_package_call_notify_cb (DBusGProxy *proxy,
DBusGProxyCall *call,
@@ -221,7 +216,6 @@ confirm_search_dialog_response_cb (GtkDialog *dialog,
installer_data_free (idata);
}
}
-#endif /* ENABLE_PACKAGEKIT */
void
@@ -232,6 +226,8 @@ dlg_package_installer (FrWindow *window,
InstallerData *idata;
GType command_type;
FrCommand *command;
+ DBusGConnection *connection;
+ gboolean success = FALSE;
idata = g_new0 (InstallerData, 1);
idata->window = g_object_ref (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]