[maemo-commits] [maemo-commits] r11410 - projects/haf/trunk/clipboard-manager

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-03 15:00:53 +0300 (Thu, 03 May 2007)
New Revision: 11410

Modified:
   projects/haf/trunk/clipboard-manager/ChangeLog
   projects/haf/trunk/clipboard-manager/manager.c
Log:
Silence compiler warnings

2007-05-03  Tommi Komulainen  <tommi.komulainen at nokia.com>
	
	Silence compiler warnings

	* manager.c (x_error): Return a dummy value
	(main): Remove redundant if and unconditionally initialize the manager


Modified: projects/haf/trunk/clipboard-manager/ChangeLog
===================================================================
--- projects/haf/trunk/clipboard-manager/ChangeLog	2007-05-03 11:58:39 UTC (rev 11409)
+++ projects/haf/trunk/clipboard-manager/ChangeLog	2007-05-03 12:00:53 UTC (rev 11410)
@@ -1,3 +1,10 @@
+2007-05-03  Tommi Komulainen  <tommi.komulainen at nokia.com>
+	
+	Silence compiler warnings
+
+	* manager.c (x_error): Return a dummy value
+	(main): Remove redundant if and unconditionally initialize the manager
+
 2005-05-17  Anders Carlsson  <andersca at imendio.com>
 
 	* manager.c (main): Add a NULL check for the display.

Modified: projects/haf/trunk/clipboard-manager/manager.c
===================================================================
--- projects/haf/trunk/clipboard-manager/manager.c	2007-05-03 11:58:39 UTC (rev 11409)
+++ projects/haf/trunk/clipboard-manager/manager.c	2007-05-03 12:00:53 UTC (rev 11410)
@@ -59,6 +59,7 @@
 	 XErrorEvent *error)
 {
   error_code = error->error_code;
+  return 0; /* ignored */
 }
 
 int 
@@ -82,17 +83,14 @@
       exit (1);
     }
 
-  if (!terminated)
+  XSetErrorHandler (x_error);
+  manager = clipboard_manager_new (display,
+				   error_trap_push, error_trap_pop,
+				   terminate_cb, &terminated);
+  if (!manager)
     {
-      XSetErrorHandler (x_error);
-      manager = clipboard_manager_new (display,
-				       error_trap_push, error_trap_pop,
-				       terminate_cb, &terminated);
-      if (!manager)
-	{
-	  fprintf (stderr, "Could not create clipboard manager!\n");
-	  exit (1);
-	}
+      fprintf (stderr, "Could not create clipboard manager!\n");
+      exit (1);
     }
 
   while (!terminated)