From 3c50cb18a117201176b300eca1a8c2df938bb0b3 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 12 Nov 2009 18:13:47 +0100
Subject: disable compilation of the rest of socket code

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 src/CLI/Makefile.am | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/CLI')

diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index dbeb1c38..e84d426a 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -1,15 +1,11 @@
 bin_PROGRAMS = abrt-cli
 
+# removed: ABRTSocket.h ABRTSocket.cpp
 abrt_cli_SOURCES = \
     CLI.cpp \
-    ABRTSocket.h \
-    ABRTSocket.cpp \
-    run-command.h \
-    run-command.cpp \
-    report.h \
-    report.cpp \
-    dbus.h \
-    dbus.cpp
+    run-command.h run-command.cpp \
+    report.h report.cpp \
+    dbus.h dbus.cpp
 
 abrt_cli_CPPFLAGS = \
     -I$(srcdir)/../../inc \
-- 
cgit 


From ef2c11ac4b8a89f5e471a16e665733a319f273fb Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Thu, 12 Nov 2009 21:47:07 +0100
Subject: build fixes

---
 src/CLI/CLI.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/CLI')

diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp
index edc8df00..149e9364 100644
--- a/src/CLI/CLI.cpp
+++ b/src/CLI/CLI.cpp
@@ -17,7 +17,6 @@
 */
 #include <getopt.h>
 #include "ABRTException.h"
-#include "ABRTSocket.h"
 #include "abrtlib.h"
 #include "abrt_dbus.h"
 #include "DBusCommon.h"
-- 
cgit 


From e8a1a7159416e7a7a343666baae8668f4eeb5209 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 18 Nov 2009 19:46:29 +0100
Subject: include abrt version in bug descriptions

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 src/CLI/CLI.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/CLI')

diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp
index 149e9364..9f2db3f0 100644
--- a/src/CLI/CLI.cpp
+++ b/src/CLI/CLI.cpp
@@ -98,20 +98,19 @@ static const struct option longopts[] =
 };
 
 /* Gets the program name from the first command line argument. */
-static char *progname(char *argv0)
+static const char *progname(const char *argv0)
 {
-    char* name = strrchr(argv0, '/');
+    const char* name = strrchr(argv0, '/');
     if (name)
         return ++name;
-    else
-        return argv0;
+    return argv0;
 }
 
 /* Prints abrt-cli version and some help text. */
 static void usage(char *argv0)
 {
-    char *name = progname(argv0);
-    printf("%s " VERSION "\n\n", name);
+    const char *name = progname(argv0);
+    printf("%s "VERSION"\n\n", name);
 
     /* Message has embedded tabs. */
     printf(_("Usage: %s [OPTION]\n\n"
@@ -166,7 +165,7 @@ int main(int argc, char** argv)
                 return 1;
             case 'V':
             case OPT_VERSION:
-                printf("%s " VERSION "\n", progname(argv[0]));
+                printf("%s "VERSION"\n", progname(argv[0]));
                 return 0;
         }
         if (c == -1)
-- 
cgit