[gnome-network] r20927 - in /desktop/unstable/gnome-nettool/debian: changelog patches/01_network-manager.patch

[joss users alioth debian org]

Author: joss
Date: Sat Aug 15 08:37:00 2009
New Revision: 20927

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20927
Log:
01_network-manager.patch: new patch. Use NM instead of network-admin 
to configure the connection.

Added:
    desktop/unstable/gnome-nettool/debian/patches/01_network-manager.patch
Modified:
    desktop/unstable/gnome-nettool/debian/changelog

Modified: desktop/unstable/gnome-nettool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/changelog?rev=20927&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/changelog [utf-8] Sat Aug 15 08:37:00 2009
@@ -1,3 +1,10 @@
+gnome-nettool (2.26.2-3) unstable; urgency=low
+
+  * 01_network-manager.patch: new patch. Use NM instead of network-admin 
+    to configure the connection.
+
+ -- Josselin Mouette <joss debian org>  Sat, 15 Aug 2009 10:36:52 +0200
+
 gnome-nettool (2.26.2-2) unstable; urgency=low
 
   * Add missing build-dependency on docbook-xml.

Added: desktop/unstable/gnome-nettool/debian/patches/01_network-manager.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/01_network-manager.patch?rev=20927&op=file
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/01_network-manager.patch (added)
+++ desktop/unstable/gnome-nettool/debian/patches/01_network-manager.patch [utf-8] Sat Aug 15 08:37:00 2009
@@ -1,0 +1,32 @@
+--- src/callbacks.c.orig	2009-08-15 10:18:32.958836764 +0200
++++ src/callbacks.c	2009-08-15 10:20:56.990335812 +0200
+@@ -124,7 +124,6 @@
+ void
+ on_configure_button_clicked (GtkButton *button, gpointer data)
+ {
+-	GString *command_line;
+ 	GtkComboBox *combo;
+ 	GtkTreeModel *model;
+ 	GtkTreeIter iter;
+@@ -143,11 +142,7 @@
+ 	if (gtk_combo_box_get_active_iter (combo, &iter)) {
+ 		gtk_tree_model_get (model, &iter, 2, &nic, -1);
+ 
+-		command_line = g_string_new (info->network_tool_path);
+-		g_string_append (command_line, " --configure ");
+-		g_string_append (command_line, nic);
+-
+-		if (!g_spawn_command_line_async (command_line->str, &error)) {
++		if (!g_spawn_command_line_async (info->network_tool_path, &error)) {
+ 			dialog = gtk_message_dialog_new (GTK_WINDOW (info->main_window),
+ 							 GTK_DIALOG_DESTROY_WITH_PARENT,
+ 							 GTK_MESSAGE_ERROR,
+@@ -156,8 +151,6 @@
+ 			gtk_dialog_run (GTK_DIALOG (dialog));
+ 			gtk_widget_destroy (dialog);
+ 		}
+-
+-		g_string_free (command_line, TRUE);
+ 	}
+ }
+