Remove DBUS_CLIENT_CFLAGS, which is always empty

[platform/upstream/dbus.git] / tools / dbus-viewer.c

diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index ae44075..2fd2847 100644 (file)
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -1,5 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-viewer.c Graphical D-BUS frontend utility
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* dbus-viewer.c Graphical D-Bus frontend utility
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
@@ -17,7 +17,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 #include <config.h>
@@ -182,8 +182,8 @@ load_child_nodes (const char *service_name,
         }
   
       if (!dbus_g_proxy_call (proxy, "Introspect", error,
+                              G_TYPE_INVALID,
                              G_TYPE_STRING, &data,
-                             G_TYPE_INVALID,
                              G_TYPE_INVALID))
          goto done;
       
@@ -408,7 +408,7 @@ tree_window_new (DBusGConnection *connection,
   w = g_new0 (TreeWindow, 1);
   w->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  gtk_window_set_title (GTK_WINDOW (w->window), "D-BUS Viewer");
+  gtk_window_set_title (GTK_WINDOW (w->window), "D-Bus Viewer");
   gtk_window_set_default_size (GTK_WINDOW (w->window), 400, 500);
 
   g_signal_connect (w->window, "destroy", G_CALLBACK (window_closed_callback),
@@ -473,7 +473,7 @@ usage (int ecode)
 static void
 version (void)
 {
-  printf ("D-BUS Message Bus Viewer %s\n"
+  printf ("D-Bus Message Bus Viewer %s\n"
           "Copyright (C) 2003 Red Hat, Inc.\n"
           "This is free software; see the source for copying conditions.\n"
           "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
@@ -484,7 +484,6 @@ version (void)
 int
 main (int argc, char **argv)
 {
-  const char *prev_arg;
   int i;
   GSList *files;
   gboolean end_of_args;
@@ -506,7 +505,6 @@ main (int argc, char **argv)
   services = FALSE;
   end_of_args = FALSE;
   files = NULL;
-  prev_arg = NULL;
   i = 1;
   while (i < argc)
     {
@@ -538,8 +536,6 @@ main (int argc, char **argv)
       else
         files = g_slist_prepend (files, (char*) arg);
       
-      prev_arg = arg;
-      
       ++i;
     }