Fixed several cromo problems.

main.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cromo_server.h"
 
 #include <signal.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <sys/signalfd.h>
@@ skipping 43 matching lines @@
     g_main_loop_quit(main_loop);
     return;
   }
   g_timeout_add_seconds(1, test_for_exit, &kExitTries);
 }
 
 static gboolean do_signal(void *arg) {
   int sig = reinterpret_cast<int>(arg);
   LOG(INFO) << "Signal: " << sig;
 
-  if (sig == SIGTERM) {
+  if (sig == SIGTERM || sig == SIGINT) {
     exit_main_loop();
   }
 
   return FALSE;
 }
 
 static void *handle_signals(void *arg) {
   sigset_t sigs;
   siginfo_t info;
   info.si_signo = 0;
   sigemptyset(&sigs);
   sigaddset(&sigs, SIGTERM);
   sigaddset(&sigs, SIGINT);
   LOG(INFO) << "waiting for signals";
-  while (info.si_signo != SIGTERM) {
+  while (info.si_signo != SIGTERM && info.si_signo != SIGINT) {
     sigwaitinfo(&sigs, &info);
     g_idle_add(do_signal, reinterpret_cast<void*>(info.si_signo));
   }
   return NULL;
 }
 
 static gboolean setup_signals(void* arg) {
   pthread_t thr;
   pthread_create(&thr, NULL, handle_signals, NULL);
   return FALSE;
@@ skipping 102 matching lines @@
 
   block_signals();
 
   DBus::default_dispatcher = &dispatcher;
   dispatcher.attach(NULL);
 
   DBus::Connection conn = DBus::Connection::SystemBus();
   conn.request_name(CromoServer::kServiceName);
 
   server = new CromoServer(conn);
-  MessageHandler m(server);
   char buf[256];
   snprintf(buf, sizeof(buf), "type='signal',interface='%s',member='%s'",
            kDBusInterface, kDBusNameOwnerChanged);
   conn.add_match(buf);
   snprintf(buf, sizeof(buf), "type='signal',interface='%s',member='%s'",
            power_manager::kPowerManagerInterface,
            power_manager::kSuspendDelay);
   conn.add_match(buf);
   DBus::MessageSlot mslot;
-  mslot = &m;
+  mslot = new MessageHandler(server);
   if (!conn.add_filter(mslot)) {
     LOG(ERROR) << "Can't add filter";
   } else {
     LOG(INFO) << "Registered filter.";
   }
 
   // Add carriers before plugins so that they can be overidden
   AddBaselineCarriers(server);
 
   // Instantiate modem handlers for each type of hardware supported
   PluginManager::LoadPlugins(server, FLAGS_plugins);
   server->CheckForPowerDaemon();
 
   dispatcher.enter();
   g_thread_init(NULL);
   main_loop = g_main_loop_new(NULL, false);
   g_idle_add(setup_signals, NULL);
   g_main_loop_run(main_loop);
 
   return 0;
 }