Network Manager Applet

Merge lp:~victor-launchpad/network-manager-applet/bugfix-lp-386900 into lp:network-manager-applet

  1. bugfix-lp-386900
  2. Merge into git-master
Proposed by Victor N
Status: Rejected
Rejected by: Max Bowsher
Proposed branch: lp:~victor-launchpad/network-manager-applet/bugfix-lp-386900
Merge into: lp:network-manager-applet
Diff against target: 38 lines (+6/-6)
1 file modified
src/applet-device-wired.c (+6/-6)
To merge this branch: bzr merge lp:~victor-launchpad/network-manager-applet/bugfix-lp-386900
Reviewer Review Type Date Requested Status
Martin Pitt (community) Disapprove
Mathieu Trudel-Lapierre (community) Disapprove
VCS imports Pending
Review via email: mp+19274@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Victor N (victor-launchpad) wrote :

I removed "Auto Eth" from the wired network notifications to fix hundred-papercuts bug 386900.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

This is sadly not where such a change would be made. You'll likely want to delete this merge request and file another against lp:~network-manager/network-manager/ubuntu.head which contains just the Ubuntu changes (and also make it as a patch rather than direct changes).

Note that you should check the comment I left in the bug, I'm not sure changing just the tooltip texts will be sufficient, what really needs changing seems to me more like just the "default" name for a connection created automatically by NetworkManager.

review: Disapprove
Revision history for this message
Martin Pitt (pitti) wrote :

Indeed we don't want to apply this in Ubuntu without it being applied upstream first, otherwise we'd have a permanent delta on user-visible strings. This would keep breaking all translations.

Also, please don't drop the interface name from the string, as it's not uncommon to have more than one. I think "wired connection (eth0)" is a good enough compromise.

review: Disapprove
Revision history for this message
Max Bowsher (maxb) wrote :

Marked Rejected, as this is proposed against an automatic import branch. And change would need to be submitted upstream instead.

Unmerged revisions

1375. By Victor N

Fix Launchpad bug #386900 by removing "Auto Eth0" from notifications.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/applet-device-wired.c'
--- src/applet-device-wired.c 2009-10-01 05:47:52 +0000
+++ src/applet-device-wired.c 2010-02-13 17:03:14 +0000
@@ -267,7 +267,7 @@
267 s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));267 s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
268 id = s_con ? nm_setting_connection_get_id (s_con) : NULL;268 id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
269 if (id)269 if (id)
270 str = g_strdup_printf (_("You are now connected to '%s'."), id);270 str = g_strdup_printf (_("You are now connected to a wired network."));
271 }271 }
272272
273 applet_do_notify_with_pref (applet,273 applet_do_notify_with_pref (applet,
@@ -298,20 +298,20 @@
298298
299 switch (state) {299 switch (state) {
300 case NM_DEVICE_STATE_PREPARE:300 case NM_DEVICE_STATE_PREPARE:
301 *tip = g_strdup_printf (_("Preparing wired network connection '%s'..."), id);301 *tip = g_strdup_printf (_("Preparing wired network connection..."));
302 break;302 break;
303 case NM_DEVICE_STATE_CONFIG:303 case NM_DEVICE_STATE_CONFIG:
304 *tip = g_strdup_printf (_("Configuring wired network connection '%s'..."), id);304 *tip = g_strdup_printf (_("Configuring wired network connection..."));
305 break;305 break;
306 case NM_DEVICE_STATE_NEED_AUTH:306 case NM_DEVICE_STATE_NEED_AUTH:
307 *tip = g_strdup_printf (_("User authentication required for wired network connection '%s'..."), id);307 *tip = g_strdup_printf (_("User authentication required for a wired network connection..."));
308 break;308 break;
309 case NM_DEVICE_STATE_IP_CONFIG:309 case NM_DEVICE_STATE_IP_CONFIG:
310 *tip = g_strdup_printf (_("Requesting a wired network address for '%s'..."), id);310 *tip = g_strdup_printf (_("Requesting a wired network address..."));
311 break;311 break;
312 case NM_DEVICE_STATE_ACTIVATED:312 case NM_DEVICE_STATE_ACTIVATED:
313 pixbuf = applet->wired_icon;313 pixbuf = applet->wired_icon;
314 *tip = g_strdup_printf (_("Wired network connection '%s' active"), id);314 *tip = g_strdup_printf (_("Wired network connection active"));
315 break;315 break;
316 default:316 default:
317 break;317 break;

Subscribers

People subscribed via source and target branches

to all changes: