[network-manager-applet/NMA_0_8] Revert "editor: don't crash in edit_done_cb() when connection is invalid (rh #704848)"



commit bac73025a9ac791f90e9dc71aac886460d4678e0
Author: JiÅ?í KlimeÅ¡ <jklimes redhat com>
Date:   Wed May 25 16:09:05 2011 +0200

    Revert "editor: don't crash in edit_done_cb() when connection is invalid (rh #704848)"
    
    This reverts commit 96c41bf6caddddb768b6704c9aa8f50de6cbc1f7.
    
    This commit was mistakenly cherry-picked from master. We don't need it, EDITING_DONE
    signal is not defined in this branch.

 src/connection-editor/nm-connection-list.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index d8a2e0c..f225ba5 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -768,7 +768,6 @@ edit_done_cb (NMConnectionEditor *editor, gint response, GError *error, gpointer
 			                   info->orig_scope,
 			                   connection_updated_cb,
 			                   info);
-			g_signal_emit (info->list, list_signals[EDITING_DONE], 0, 0);
 		} else {
 			g_warning ("%s: invalid connection after update: bug in the "
 			           "'%s' / '%s' invalid: %d",
@@ -778,11 +777,8 @@ edit_done_cb (NMConnectionEditor *editor, gint response, GError *error, gpointer
 			connection_updated_cb (info->list,
 			                       NM_SETTINGS_CONNECTION_INTERFACE (connection),
 			                       edit_error,
-			                       NULL);
+			                       info);
 			g_error_free (edit_error);
-
-			g_signal_emit (info->list, list_signals[EDITING_DONE], 0, 0);
-			g_free (info);
 		}
 		break;
 	case GTK_RESPONSE_NONE:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]