[maemo-commits] [maemo-commits] r18051 - projects/haf/trunk/maemo-launcher/launcher

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Apr 14 10:35:25 EEST 2009 
Author: makarhun
Date: 2009-04-14 10:35:23 +0300 (Tue, 14 Apr 2009)
New Revision: 18051

Modified:
   projects/haf/trunk/maemo-launcher/launcher/Makefile.am
   projects/haf/trunk/maemo-launcher/launcher/booster.c
   projects/haf/trunk/maemo-launcher/launcher/booster.h
   projects/haf/trunk/maemo-launcher/launcher/booster_api.h
   projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c
   projects/haf/trunk/maemo-launcher/launcher/booster_gtk.h
   projects/haf/trunk/maemo-launcher/launcher/booster_null.c
   projects/haf/trunk/maemo-launcher/launcher/booster_qt.c
   projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
   projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h
   projects/haf/trunk/maemo-launcher/launcher/comm_msg.c
   projects/haf/trunk/maemo-launcher/launcher/comm_msg.h
   projects/haf/trunk/maemo-launcher/launcher/defender.c
   projects/haf/trunk/maemo-launcher/launcher/invokelib.c
   projects/haf/trunk/maemo-launcher/launcher/invokelib.h
   projects/haf/trunk/maemo-launcher/launcher/invoker.c
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
   projects/haf/trunk/maemo-launcher/launcher/prog.c
   projects/haf/trunk/maemo-launcher/launcher/prog.h
   projects/haf/trunk/maemo-launcher/launcher/report.c
   projects/haf/trunk/maemo-launcher/launcher/report.h
   projects/haf/trunk/maemo-launcher/launcher/search.c
   projects/haf/trunk/maemo-launcher/launcher/search.h
   projects/haf/trunk/maemo-launcher/launcher/summoner.c
   projects/haf/trunk/maemo-launcher/launcher/test_lib.c
   projects/haf/trunk/maemo-launcher/launcher/test_lib.h
   projects/haf/trunk/maemo-launcher/launcher/test_msg.c
   projects/haf/trunk/maemo-launcher/launcher/test_msg_perf.c
Log:
0.34 sync

Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id$
-#
 
 helperdir = $(libdir)/maemo-launcher
 helper_PROGRAMS = defender
@@ -27,8 +25,8 @@
 booster_gtk_so_SOURCES = booster_gtk.c booster_gtk.h
 booster_gtk_so_CFLAGS = -fPIC
 booster_gtk_so_LDFLAGS = -shared -fPIC
-booster_gtk_so_CPPFLAGS = $(BOOSTER_GTK_CFLAGS)
-booster_gtk_so_LDADD = $(BOOSTER_GTK_LIBS)
+booster_gtk_so_CPPFLAGS = $(BOOSTER_GTK_CFLAGS) $(BOOSTER_HILDON_CFLAGS)
+booster_gtk_so_LDADD = $(BOOSTER_GTK_LIBS) $(BOOSTER_HILDON_LIBS)
 
 if USE_QT_BOOSTER
 booster_PROGRAMS += booster-qt.so

Modified: projects/haf/trunk/maemo-launcher/launcher/booster.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2006, 2007 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/booster.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_api.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_api.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_api.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *          Michael Natterer <mitch at imendio.com>
  *

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_gtk.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_gtk.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_gtk.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007 Nokia Corporation
- *
  * Autogenerated file
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_null.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_null.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_null.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006 Nokia Corporation
  *
- * Copyright (C) 2006 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_qt.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_qt.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_qt.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2006, 2007 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006 Nokia Corporation
  *
- * Copyright (C) 2006 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_msg.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_msg.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_msg.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_msg.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_msg.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_msg.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/defender.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/defender.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/defender.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006 Nokia Corporation
  *
- * Copyright (C) 2006 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/invokelib.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/invokelib.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/invokelib.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005 Nokia Corporation
  *
- * Copyright (C) 2005 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/invokelib.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/invokelib.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/invokelib.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2009 Nokia Corporation
  *
- * Copyright (C) 2005, 2006 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,7 +43,9 @@
 #define INVOKER_MSG_NAME		0x5a5e0000
 #define INVOKER_MSG_EXEC		0xe8ec0000
 #define INVOKER_MSG_ARGS		0xa4650000
+#define INVOKER_MSG_ENV			0xe5710000
 #define INVOKER_MSG_PRIO		0xa1ce0000
+#define INVOKER_MSG_IO			0x10fd0000
 #define INVOKER_MSG_END			0xdead0000
 #define INVOKER_MSG_PID			0x1d1d0000
 #define INVOKER_MSG_EXIT		0xe4170000

Modified: projects/haf/trunk/maemo-launcher/launcher/invoker.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/invoker.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/invoker.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007, 2008, 2009 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007, 2008 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,6 +28,7 @@
 #include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
@@ -193,6 +192,60 @@
 }
 
 static bool
+invoker_send_io(int fd)
+{
+  struct msghdr msg = { 0 };
+  struct cmsghdr *cmsg;
+  int io[3] = { 0, 1, 2 };
+  char buf[CMSG_SPACE(sizeof(io))];
+  struct iovec iov;
+  int dummy;
+
+  iov.iov_base = &dummy;
+  iov.iov_len = 1;
+
+  msg.msg_iov = &iov;
+  msg.msg_iovlen = 1;
+  msg.msg_control = buf;
+  msg.msg_controllen = sizeof(buf);
+
+  cmsg = CMSG_FIRSTHDR(&msg);
+  cmsg->cmsg_len = CMSG_LEN(sizeof(io));
+  cmsg->cmsg_level = SOL_SOCKET;
+  cmsg->cmsg_type = SCM_RIGHTS;
+
+  memcpy(CMSG_DATA(cmsg), io, sizeof(io));
+
+  msg.msg_controllen = cmsg->cmsg_len;
+
+  invoke_send_msg(fd, INVOKER_MSG_IO);
+  if (sendmsg(fd, &msg, 0) < 0)
+  {
+    warning("sendmsg failed in invoker_send_io: %s", strerror(errno));
+    return  false;
+  }
+
+  return true;
+}
+
+static bool
+invoker_send_env(int fd)
+{
+  int i, n_vars;
+
+  /* Count the amount of environment variables. */
+  for (n_vars = 0; environ[n_vars] != NULL; n_vars++) ;
+
+  /* Send action. */
+  invoke_send_msg(fd, INVOKER_MSG_ENV);
+  invoke_send_msg(fd, n_vars);
+  for (i = 0; i < n_vars; i++)
+    invoke_send_str(fd, environ[i]);
+
+  return true;
+}
+
+static bool
 invoker_send_end(int fd)
 {
   /* Send action. */
@@ -412,6 +465,8 @@
   invoker_send_exec(fd, prog_name);
   invoker_send_args(fd, prog_argc, prog_argv);
   invoker_send_prio(fd, prog_prio);
+  invoker_send_io(fd);
+  invoker_send_env(fd);
   invoker_send_end(fd);
 
   if (launch)

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007, 2008, 2009 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007, 2008 Nokia Corporation
- *
  * Authors: Michael Natterer <mitch at imendio.com>
  *          Guillem Jover <guillem.jover at nokia.com>
  *
@@ -35,6 +33,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 #include <sys/resource.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -92,7 +91,7 @@
   if (write(fd, OOM_ENABLE, strlen(OOM_ENABLE)) < 0)
   {
     if (errno == EPERM)
-      error("kernel w/o support for user processes rising the oom value\n");
+      error("kernel w/o support for user processes raising the oom value\n");
     else
       error("could not write to file '%s'\n", filename);
   }
@@ -122,7 +121,7 @@
     return true;
   else
   {
-    warning("rising the oom shield for pid=%d status=%d\n", pid, status);
+    warning("raising the oom shield for pid=%d status=%d\n", pid, status);
     return false;
   }
 }
@@ -131,6 +130,7 @@
 launch_process(prog_t *prog)
 {
   int cur_prio;
+  int i;
 
   /* Possibly restore process priority. */
   errno = 0;
@@ -149,11 +149,19 @@
   debug("launching process: '%s'\n", prog->filename);
 
 #ifdef DEBUG
+  for (i = 0; i < 3; i++)
+    if (prog->io[i] > 0)
+      debug("redirecting stdio[%d] to %d\n", i, prog->io[i]);
+
   report_set_output(report_console);
 #else
   report_set_output(report_none);
 #endif
 
+  for (i = 0; i < 3; i++)
+    if (prog->io[i] > 0)
+      dup2(prog->io[i], i);
+
   exit(prog->entry(prog->argc, prog->argv));
 }
 
@@ -296,6 +304,87 @@
 }
 
 static bool
+invoked_get_io(int fd, prog_t *prog)
+{
+  struct msghdr msg = { 0 };
+  struct cmsghdr *cmsg;
+  char buf[CMSG_SPACE(sizeof(prog->io))];
+  struct iovec iov;
+  int dummy;
+
+  iov.iov_base = &dummy;
+  iov.iov_len = 1;
+
+  msg.msg_iov = &iov;
+  msg.msg_iovlen = 1;
+  msg.msg_control = buf;
+  msg.msg_controllen = sizeof(buf);
+
+  cmsg = CMSG_FIRSTHDR(&msg);
+  cmsg->cmsg_len = CMSG_LEN(sizeof(prog->io));
+  cmsg->cmsg_level = SOL_SOCKET;
+  cmsg->cmsg_type = SCM_RIGHTS;
+
+  memcpy(CMSG_DATA(cmsg), prog->io, sizeof(prog->io));
+
+  if (recvmsg(fd, &msg, 0) < 0)
+  {
+    warning("recvmsg failed in invoked_get_io: %s", strerror(errno));
+    return false;
+  }
+
+  if (msg.msg_flags)
+  {
+    warning("unexpected msg flags in invoked_get_io");
+    return false;
+  }
+
+  cmsg = CMSG_FIRSTHDR(&msg);
+  if (cmsg == NULL || cmsg->cmsg_len != CMSG_LEN(sizeof(prog->io)) ||
+      cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
+  {
+    warning("invalid cmsg in invoked_get_io");
+    return false;
+  }
+
+  memcpy(prog->io, CMSG_DATA(cmsg), sizeof(prog->io));
+
+  return true;
+}
+
+static bool
+invoked_get_env(int fd, prog_t *prog)
+{
+  int i;
+  uint32_t n_vars;
+
+  /* Get number of environment variables. */
+  invoke_recv_msg(fd, &n_vars);
+
+  /* Get environ. */
+  for (i = 0; i < n_vars; i++)
+  {
+    char *var;
+
+    var = invoke_recv_str(fd);
+    if (var == NULL)
+    {
+      error("receiving environ[%i]\n", i);
+      return false;
+    }
+
+    debug("setting environment variable '%s'\n", var);
+
+    /* In case of error, just warn and try to continue, as the other side is
+     * going to keep sending the reset of the message. */
+    if (putenv(var) != 0)
+      warning("allocating environment variable");
+  }
+
+  return true;
+}
+
+static bool
 invoked_send_action(int fd, int action, int value)
 {
   invoke_send_msg(fd, action);
@@ -328,9 +417,15 @@
     case INVOKER_MSG_ARGS:
       invoked_get_args(fd, prog);
       break;
+    case INVOKER_MSG_ENV:
+      invoked_get_env(fd, prog);
+      break;
     case INVOKER_MSG_PRIO:
       invoked_get_prio(fd, prog);
       break;
+    case INVOKER_MSG_IO:
+      invoked_get_io(fd, prog);
+      break;
     case INVOKER_MSG_END:
       invoke_send_msg(fd, INVOKER_MSG_ACK);
 
@@ -932,6 +1027,10 @@
 
     /* Start conversation with the invoker. */
     memset(&prog, 0, sizeof(prog));
+    prog.io[0] = -1;
+    prog.io[1] = -1;
+    prog.io[2] = -1;
+
     if (!invoked_get_magic(sd, &prog))
     {
       close(sd);

Modified: projects/haf/trunk/maemo-launcher/launcher/prog.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/prog.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/prog.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007, 2008 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007, 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/prog.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/prog.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/prog.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006, 2007, 2008, 2009 Nokia Corporation
  *
- * Copyright (C) 2005, 2006, 2007, 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,6 +31,7 @@
   const char *filename;
   char *name;
   int prio;
+  int io[3];
   entry_t entry;
 } prog_t;
 

Modified: projects/haf/trunk/maemo-launcher/launcher/report.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/report.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/report.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006 Nokia Corporation
  *
- * Copyright (C) 2005, 2006 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/report.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/report.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/report.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2005, 2006 Nokia Corporation
  *
- * Copyright (C) 2005, 2006 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/search.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/search.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/search.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2007 Nokia Corporation
  *
- * Copyright (C) 2007 Nokia Corporation
- *
  * Contact: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/search.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/search.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/search.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2007 Nokia Corporation
  *
- * Copyright (C) 2007 Nokia Corporation
- *
  * Contact: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/summoner.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/summoner.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/summoner.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2006, 2007 Nokia Corporation
  *
- * Copyright (C) 2006, 2007 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/test_lib.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/test_lib.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/test_lib.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/test_lib.h
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/test_lib.h	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/test_lib.h	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/test_msg.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/test_msg.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/test_msg.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Authors: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify

Modified: projects/haf/trunk/maemo-launcher/launcher/test_msg_perf.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/test_msg_perf.c	2009-04-14 07:34:35 UTC (rev 18050)
+++ projects/haf/trunk/maemo-launcher/launcher/test_msg_perf.c	2009-04-14 07:35:23 UTC (rev 18051)
@@ -1,8 +1,6 @@
 /*
- * $Id$
+ * Copyright © 2008 Nokia Corporation
  *
- * Copyright (C) 2008 Nokia Corporation
- *
  * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
More information about the maemo-commits mailing list