From c7197324b1e9e33260a1d9fd7e26528d9d562abc Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Wed, 15 Jun 2011 04:14:14 +0200
Subject: cli: use deletion through socket. cli does not depend on dbus anymore

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---
 src/applet/Makefile.am  | 3 ++-
 src/cli/Makefile.am     | 4 ++--
 src/cli/cli.c           | 1 -
 src/daemon/Makefile.am  | 3 ++-
 src/daemon/abrtd.c      | 6 +++---
 src/gui-gtk/Makefile.am | 4 +---
 src/gui-gtk/abrt-gtk.c  | 1 -
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am
index bfcf22e3..33d5d578 100644
--- a/src/applet/Makefile.am
+++ b/src/applet/Makefile.am
@@ -24,7 +24,8 @@ abrt_applet_CPPFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_applet_LDADD = \
-    $(LIBREPORT_GTK_LIBS) -labrt_dbus \
+    $(LIBREPORT_GTK_LIBS) \
+    -labrt_dbus \
     -lglib-2.0 \
     -lgthread-2.0 \
     $(DBUS_LIBS) \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 5746e4b2..330061de 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -13,13 +13,13 @@ abrt_cli_CPPFLAGS = \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-    $(DBUS_CFLAGS) $(GLIB_CFLAGS) \
+    $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     $(LIBREPORT_CFLAGS) \
     -Wall -Wwrite-strings -Werror
 #    $(GTK_CFLAGS)
 abrt_cli_LDADD = \
-    $(LIBREPORT_LIBS) -labrt_dbus \
+    $(LIBREPORT_LIBS) \
     $(GLIB_LIBS)
 
 MAN_TXT = \
diff --git a/src/cli/cli.c b/src/cli/cli.c
index 0e4ce98c..db971b83 100644
--- a/src/cli/cli.c
+++ b/src/cli/cli.c
@@ -20,7 +20,6 @@
 #endif
 #include <getopt.h>
 #include "abrtlib.h"
-#include "abrt_dbus.h"
 #include "report.h"
 
 
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 0a00c254..f2f90d69 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -38,7 +38,8 @@ abrtd_CPPFLAGS = \
 abrtd_LDADD = \
     $(DBUS_LIBS) \
     ../lib/libabrt.la \
-    $(LIBREPORT_LIBS) -labrt_dbus
+    $(LIBREPORT_LIBS) \
+    -labrt_dbus
 
 abrt_server_SOURCES = \
     abrt-server.c
diff --git a/src/daemon/abrtd.c b/src/daemon/abrtd.c
index 7a1ab318..5746a319 100644
--- a/src/daemon/abrtd.c
+++ b/src/daemon/abrtd.c
@@ -30,12 +30,12 @@
 #include "MiddleWare.h"
 #include "parse_options.h"
 
-#define VAR_RUN_PIDFILE     VAR_RUN"/abrtd.pid"
+#define VAR_RUN_PIDFILE   VAR_RUN"/abrtd.pid"
 
-#define SOCKET_FILE VAR_RUN"/abrt/abrt.socket"
+#define SOCKET_FILE       VAR_RUN"/abrt/abrt.socket"
 #define SOCKET_PERMISSION 0666
 /* Maximum number of simultaneously opened client connections. */
-#define MAX_CLIENT_COUNT 10
+#define MAX_CLIENT_COUNT  10
 
 
 /* Daemon initializes, then sits in glib main loop, waiting for events.
diff --git a/src/gui-gtk/Makefile.am b/src/gui-gtk/Makefile.am
index a543eb98..d6387f87 100644
--- a/src/gui-gtk/Makefile.am
+++ b/src/gui-gtk/Makefile.am
@@ -15,7 +15,6 @@ abrt_gui_CFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     -DICON_DIR=\"${datadir}/abrt/icons/hicolor/48x48/status\" \
     $(GTK_CFLAGS) \
-    $(DBUS_CFLAGS) \
     $(LIBREPORT_GTK_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Wwrite-strings -Werror
@@ -27,8 +26,7 @@ abrt_gui_LDADD = \
     -lglib-2.0 \
     -lgthread-2.0 \
     $(GTK_LIBS) \
-    $(DBUS_LIBS) \
-    $(LIBREPORT_GTK_LIBS) -labrt_dbus
+    $(LIBREPORT_GTK_LIBS)
 #    $(LIBNOTIFY_LIBS)
 
 #test_report_SOURCES = \
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c
index 9a49787d..d61ef4e6 100644
--- a/src/gui-gtk/abrt-gtk.c
+++ b/src/gui-gtk/abrt-gtk.c
@@ -19,7 +19,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include "abrtlib.h"
-#include "abrt_dbus.h"
 #include "abrt-gtk.h"
 #include "libreport-gtk.h"
 
-- 
cgit