Merge revisions 36534:36684 from trunk.

svn path=/branches/kill-bonobo/; revision=36685

5 files changed, 38 insertions, 9 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index ad724371c3..4ea93c997e 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,33 @@
+2008-10-17  Kandepu Prasad  <kaprasad@novell.com>
+
+	** Fix for bug #311479
+
+	* import.glade:
+	* importer/import.glade: rephrasing the heading in Evolution Import 
+	Assistant
+
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #548469
+
+	* Makefile.am:
+	* e-shell-nm-glib.c:
+	* e-shell-nm.c (reinit_dbus), (e_shell_network_monitor),
+	(e_shell_dbus_initialise):
+	* e-shell-window-commands.c (command_work_offline),
+	(command_work_online):
+	* e-shell-window.c (offline_toggle_clicked_cb), (impl_dispose):
+	* e-shell.c (impl_Shell_setLineStatus), (e_shell_construct),
+	(e_shell_set_line_status):
+	* e-shell.h:
+	Drop support for deprecated libnm-glib. 
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-shell-window.c:
+
 2008-09-30  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 930e80f124..c0cae505dc 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -51,13 +51,12 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
                          DBusMessage *message,
                          gpointer user_data)
 {
-	DBusError error;
+	DBusError error = DBUS_ERROR_INIT;
 	const gchar *object;
 	EShell *shell = user_data;
 	EShellLineStatus line_status;
 	gboolean device_active;
 
-	dbus_error_init (&error);
 	object = dbus_message_get_path (message);
 
 	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
@@ -94,16 +93,16 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
 gboolean
 e_shell_dbus_initialize (EShell *shell)
 {
-	DBusError error;
+	DBusError error = DBUS_ERROR_INIT;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
 
 	if (dbus_connection != NULL)
 		return TRUE;
 
-	dbus_error_init (&error);
-	if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-		g_warning ("could not get system bus: %s\n", error.message);
+	dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+	if (dbus_connection == NULL) {
+		g_warning ("%s", error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
@@ -120,6 +119,7 @@ e_shell_dbus_initialize (EShell *shell)
 			    "sender='" NM_DBUS_SERVICE "',"
 			    "path='" NM_DBUS_PATH "'", &error);
 	if (dbus_error_is_set (&error)) {
+		g_warning ("%s", error.message);
 		dbus_error_free (&error);
 		goto exception;
 	}
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index de68d343e4..f278af0bf8 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -48,7 +48,6 @@ shell_window_new_view (EShellWindow *shell_window,
 	GtkNotebook *notebook;
 	GtkAction *action;
 	GtkWidget *widget;
-	gchar *action_name;
 	gint page_num;
 
 	/* Determine the page number for the new shell view. */
diff --git a/shell/import.glade b/shell/import.glade
index 813f2e90f1..389d2feee3 100644
--- a/shell/import.glade
+++ b/shell/import.glade
@@ -92,7 +92,7 @@ importing external files into Evolution.</property>
       <child>
 	<widget class="GnomeDruidPageStandard" id="page2-intelligent">
 	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Select Importers</property>
+	  <property name="title" translatable="yes">Select Information to Import</property>
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox3">
diff --git a/shell/importer/import.glade b/shell/importer/import.glade
index 813f2e90f1..389d2feee3 100644
--- a/shell/importer/import.glade
+++ b/shell/importer/import.glade
@@ -92,7 +92,7 @@ importing external files into Evolution.</property>
       <child>
 	<widget class="GnomeDruidPageStandard" id="page2-intelligent">
 	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Select Importers</property>
+	  <property name="title" translatable="yes">Select Information to Import</property>
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox3">