File nm-configure-networking-rml.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-configure-networking-rml.patch of Package NetworkManager (Revision b132ac3cd59fa0ede620847207e8147c)

Currently displaying revision b132ac3cd59fa0ede620847207e8147c , Show latest

? gnome/applet/applet.gladep
Index: gnome/applet/applet.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/gnome/applet/applet.c,v
retrieving revision 1.112.2.3
diff -u -r1.112.2.3 applet.c
--- gnome/applet/applet.c	9 Mar 2006 21:51:24 -0000	1.112.2.3
+++ gnome/applet/applet.c	15 Mar 2006 16:01:28 -0000
@@ -271,16 +271,43 @@
 	return TRUE;
 }
 
-static void nma_show_info_cb (GtkMenuItem *mi, NMApplet *applet)
+
+static gboolean nma_run_yast (GtkWidget *info_dialog)
 {
-	GtkWidget *info_dialog;
+	char *argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "lan", NULL };
+	GError *err = NULL;
 
-	info_dialog = glade_xml_get_widget (applet->info_dialog_xml, "info_dialog");
+	if (!g_spawn_async ("/", argv, NULL, 0, NULL, NULL, NULL, &err))
+	{
+		GtkWidget *dialog;
+		char *msg;
+
+		msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
+						   _("Network configuration could not be run"), err->message);
+
+		dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg);
+		gtk_dialog_run (GTK_DIALOG (dialog));
+
+		gtk_widget_destroy (dialog);
+		g_free (msg);
+		g_error_free (err);
+	}
+
+	gtk_widget_hide (info_dialog);
 
+	return FALSE;
+}
+
+
+static void nma_show_info_cb (GtkMenuItem *mi, NMApplet *applet)
+{
 	if (nma_update_info (applet))
 	{
+		GtkWidget *	info_dialog;
+
+		info_dialog = glade_xml_get_widget (applet->info_dialog_xml, "info_dialog");
+
 		gtk_window_present (GTK_WINDOW (info_dialog));
-		g_signal_connect_swapped (info_dialog, "response", G_CALLBACK (gtk_widget_hide), info_dialog);
 	}
 }
 
@@ -1822,10 +1849,42 @@
 }
 
 
+static void nma_config_dialup_cb (GtkMenu *item, gpointer data)
+{
+	char *modem_argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "modem", NULL };
+	char *isdn_argv[] = { "/usr/bin/gnomesu", "/sbin/yast2", "isdn", NULL };
+	char **argv;
+	gboolean modem = (gboolean) data;
+	GError *err = NULL;
+
+	if (modem)
+		argv = modem_argv;
+	else
+		argv = isdn_argv;
+
+	if (!g_spawn_async ("/", argv, NULL, 0, NULL, NULL, NULL, &err))
+	{
+		GtkWidget *dialog;
+		char *msg;
+
+		msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
+						   _("Dialup configuration could not be run"), err->message);
+
+		dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg);
+		gtk_dialog_run (GTK_DIALOG (dialog));
+
+		gtk_widget_destroy (dialog);
+		g_free (msg);
+		g_error_free (err);
+	}
+}
+
+
 static void nma_menu_add_dialup_menu (GtkWidget *menu, NMApplet *applet)
 {
 	GtkMenuItem *item;
 	GtkMenu *dialup_menu;
+	GtkWidget *configure_item;
 	GSList *elt;
 
 	g_return_if_fail (menu != NULL);
@@ -1855,6 +1914,14 @@
 		gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), GTK_WIDGET (disconnect_item));
 	}
 
+	configure_item = gtk_menu_item_new_with_mnemonic (_("Configure _Modem..."));
+	g_signal_connect (G_OBJECT (configure_item), "activate", G_CALLBACK (nma_config_dialup_cb), (gpointer) 1);
+	gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), configure_item);
+
+	configure_item = gtk_menu_item_new_with_mnemonic (_("Configure _ISDN..."));
+	g_signal_connect (G_OBJECT (configure_item), "activate", G_CALLBACK (nma_config_dialup_cb), (gpointer) 0);
+	gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), configure_item);
+
 	gtk_menu_item_set_submenu (item, GTK_WIDGET (dialup_menu));
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item));
 	gtk_widget_show_all (GTK_WIDGET (item));
@@ -2570,6 +2637,9 @@
  */
 static GtkWidget * nma_get_instance (NMApplet *applet)
 {
+	GtkWidget *	widget;
+	GtkWidget *	info_dialog;
+
 	gtk_widget_hide (GTK_WIDGET (applet));
 
 	applet->nm_running = FALSE;
@@ -2589,6 +2659,15 @@
 	}
 
 	applet->info_dialog_xml = glade_xml_new (applet->glade_file, "info_dialog", NULL);
+	info_dialog = glade_xml_get_widget (applet->info_dialog_xml, "info_dialog");
+
+	widget = glade_xml_get_widget (applet->info_dialog_xml, "configure_button");
+	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (nma_run_yast), info_dialog);
+
+	widget = glade_xml_get_widget (applet->info_dialog_xml, "closebutton1");
+	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_widget_hide), info_dialog);
+
+	g_signal_connect_swapped (info_dialog, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), info_dialog);
 
 	applet->gconf_client = gconf_client_get_default ();
 	if (!applet->gconf_client)
Index: gnome/applet/applet.glade
===================================================================
RCS file: /cvs/gnome/NetworkManager/gnome/applet/applet.glade,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 applet.glade
--- gnome/applet/applet.glade	10 Mar 2006 16:38:19 -0000	1.4.2.2
+++ gnome/applet/applet.glade	15 Mar 2006 16:01:28 -0000
@@ -852,24 +852,9 @@
       <property name="spacing">6</property>
 
       <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	<widget class="GtkHButtonBox" id="hbuttonbox2">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -924,7 +909,7 @@
 		    <widget class="GtkTable" id="table1">
 		      <property name="border_width">1</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">14</property>
+		      <property name="n_rows">16</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">3</property>
@@ -1689,6 +1674,165 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="closebutton1">
+			  <property name="visible">True</property>
+			  <property name="can_default">True</property>
+			  <property name="has_default">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="has_focus">True</property>
+			  <property name="label">gtk-close</property>
+			  <property name="use_stock">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">15</property>
+			  <property name="bottom_attach">16</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="configure_button">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+
+			  <child>
+			    <widget class="GtkAlignment" id="alignment2">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">0</property>
+			      <property name="yscale">0</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">0</property>
+			      <property name="right_padding">0</property>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox8">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">2</property>
+
+				  <child>
+				    <widget class="GtkImage" id="image3">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-properties</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label34">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Configure _Networking</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">15</property>
+			  <property name="bottom_attach">16</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label35">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"></property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">14</property>
+			  <property name="bottom_attach">15</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label36">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"></property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">14</property>
+			  <property name="bottom_attach">15</property>
 			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>

Places

File nm-configure-networking-rml.patch of Package NetworkManager (Revision b132ac3cd59fa0ede620847207e8147c)

Places