File nm-dont-spam-log-without-mm.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-dont-spam-log-without-mm.patch of Package NetworkManager

From 20ef8c2a38083aa9f9106e792decbea1ac57eefd Mon Sep 17 00:00:00 2001
From: Tambet Ingo <tambet@gmail.com>
Date: Mon, 16 Mar 2009 10:46:21 +0200
Subject: [PATCH] Don't spam the log if modem-manager is not installed.

diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c
index be0ca7a..743bf02 100644
--- a/src/modem-manager/nm-modem-manager.c
+++ b/src/modem-manager/nm-modem-manager.c
@@ -11,7 +11,7 @@
 #include "nm-utils.h"
 #include "nm-modem-types.h"
 
-#define MODEM_POKE_INTERVAL 120000
+#define MODEM_POKE_INTERVAL 120
 
 G_DEFINE_TYPE (NMModemManager, nm_modem_manager, G_TYPE_OBJECT)
 
@@ -200,7 +200,6 @@ poke_modem_cb (gpointer user_data)
 	                                   MM_DBUS_PATH,
 	                                   MM_DBUS_INTERFACE);
 
-	nm_info ("Trying to start the modem-manager...");
 	dbus_g_proxy_call_no_reply (proxy, "EnumerateDevices", G_TYPE_INVALID);
 	g_object_unref (proxy);
 
@@ -243,6 +242,8 @@ modem_manager_appeared (NMModemManager *self, gboolean enumerate_devices)
 		priv->poke_id = 0;
 	}
 
+	nm_info ("modem-manager is now available");
+
 	priv->proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (priv->dbus_mgr),
 									 MM_DBUS_SERVICE, MM_DBUS_PATH, MM_DBUS_INTERFACE);
 
@@ -281,8 +282,9 @@ modem_manager_disappeared (NMModemManager *self)
 	}
 
 	/* Try to activate the modem-manager */
+	nm_info ("Trying to start the modem-manager...");
 	poke_modem_cb (self);
-	priv->poke_id = g_timeout_add (MODEM_POKE_INTERVAL, poke_modem_cb, self);
+	priv->poke_id = g_timeout_add_seconds (MODEM_POKE_INTERVAL, poke_modem_cb, self);
 }
 
 static void
@@ -303,7 +305,6 @@ nm_modem_manager_name_owner_changed (NMDBusManager *dbus_mgr,
 	new_owner_good = (new_owner && strlen (new_owner));
 
 	if (!old_owner_good && new_owner_good) {
-		nm_info ("modem manager appeared");
 		modem_manager_appeared (NM_MODEM_MANAGER (user_data), FALSE);
 	} else if (old_owner_good && !new_owner_good) {
 		nm_info ("modem manager disappeared");
-- 
1.6.0.2

Places

File nm-dont-spam-log-without-mm.patch of Package NetworkManager

Places