lp:~noskcaj/ubuntu/utopic/network-manager-applet/merge
Created by
Jackson Doak
and last modified
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/utopic/network-manager-applet/merge
Only
Jackson Doak
can upload to this branch. If you are
Jackson Doak
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Mathieu Trudel-Lapierre: Disapprove
-
Diff: 103199 lines (+4685/-92960)225 files modified.pc/0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch/src/libnm-gtk/nm-mobile-wizard.c (+0/-1719)
.pc/11-user-connections.patch/src/applet-device-wifi.c (+0/-2055)
.pc/11-user-connections.patch/src/connection-editor/ce-page.h (+0/-155)
.pc/11-user-connections.patch/src/connection-editor/new-connection.c (+0/-585)
.pc/11-user-connections.patch/src/connection-editor/page-bond.c (+0/-623)
.pc/11-user-connections.patch/src/connection-editor/page-bond.h (+0/-62)
.pc/11-user-connections.patch/src/connection-editor/page-bridge.c (+0/-349)
.pc/11-user-connections.patch/src/connection-editor/page-bridge.h (+0/-62)
.pc/11-user-connections.patch/src/connection-editor/page-dsl.c (+0/-253)
.pc/11-user-connections.patch/src/connection-editor/page-dsl.h (+0/-63)
.pc/11-user-connections.patch/src/connection-editor/page-ethernet.c (+0/-405)
.pc/11-user-connections.patch/src/connection-editor/page-ethernet.h (+0/-64)
.pc/11-user-connections.patch/src/connection-editor/page-infiniband.c (+0/-272)
.pc/11-user-connections.patch/src/connection-editor/page-infiniband.h (+0/-62)
.pc/11-user-connections.patch/src/connection-editor/page-mobile.c (+0/-728)
.pc/11-user-connections.patch/src/connection-editor/page-mobile.h (+0/-63)
.pc/11-user-connections.patch/src/connection-editor/page-vlan.c (+0/-691)
.pc/11-user-connections.patch/src/connection-editor/page-vlan.h (+0/-62)
.pc/11-user-connections.patch/src/connection-editor/page-vpn.c (+0/-333)
.pc/11-user-connections.patch/src/connection-editor/page-vpn.h (+0/-71)
.pc/11-user-connections.patch/src/connection-editor/page-wifi.c (+0/-675)
.pc/11-user-connections.patch/src/connection-editor/page-wifi.h (+0/-68)
.pc/11-user-connections.patch/src/connection-editor/page-wimax.c (+0/-244)
.pc/11-user-connections.patch/src/connection-editor/page-wimax.h (+0/-62)
.pc/11-user-connections.patch/src/gnome-bluetooth/nma-bt-device.c (+0/-1317)
.pc/11-user-connections.patch/src/libnm-gtk/nm-wifi-dialog.c (+0/-1460)
.pc/11-user-connections.patch/src/mobile-helpers.c (+0/-837)
.pc/11-user-connections.patch/src/utils/utils.c (+0/-213)
.pc/11-user-connections.patch/src/utils/utils.h (+0/-63)
.pc/11-user-connections.patch/src/wireless-security/ws-wep-key.c (+0/-349)
.pc/11-user-connections.patch/src/wireless-security/ws-wpa-psk.c (+0/-199)
.pc/applet-wifi-menu-before-vpn.patch/src/applet.c (+0/-3777)
.pc/applet_adhoc_use_wpa_rsn_part1.patch/src/applet-dialogs.c (+0/-1432)
.pc/applet_adhoc_use_wpa_rsn_part1.patch/src/connection-editor/page-wifi-security.c (+0/-547)
.pc/applet_adhoc_use_wpa_rsn_part1.patch/src/libnm-gtk/nm-wifi-dialog.c (+0/-1461)
.pc/applet_adhoc_use_wpa_rsn_part1.patch/src/wireless-security/ws-wpa-psk.c (+0/-200)
.pc/applied-patches (+0/-24)
.pc/clear-notification-actions.patch/src/applet.c (+0/-3774)
.pc/git_revert_system_ca_cert.patch/src/wireless-security/eap-method-leap.c (+0/-183)
.pc/git_revert_system_ca_cert.patch/src/wireless-security/eap-method-simple.c (+0/-305)
.pc/git_revert_system_ca_cert.patch/src/wireless-security/eap-method-tls.c (+0/-481)
.pc/git_use_paths_in_vpn_name_files_4867951.patch/src/applet-vpn-request.c (+0/-496)
.pc/git_use_paths_in_vpn_name_files_4867951.patch/src/connection-editor/vpn-helpers.c (+0/-405)
.pc/hide_policy_items_env_var.patch/src/applet-device-cdma.c (+0/-821)
.pc/hide_policy_items_env_var.patch/src/applet-device-gsm.c (+0/-1301)
.pc/hide_policy_items_env_var.patch/src/applet-device-wifi.c (+0/-2041)
.pc/hide_policy_items_env_var.patch/src/applet.c (+0/-4141)
.pc/hide_policy_items_env_var.patch/src/applet.h (+0/-356)
.pc/key-certificate-extensions.patch/src/wireless-security/eap-method.c (+0/-660)
.pc/lp1048516_dont_req_keyring_in_greeter.patch/src/applet-device-gsm.c (+0/-1305)
.pc/lp1048520_delay_pin_dialog_in_greeter.patch/src/applet-device-gsm.c (+0/-1312)
.pc/lp289466_always_show_tray_icon.patch/src/applet.c (+0/-3647)
.pc/lp328572-dxteam-connect-text.patch/src/applet-device-wifi.c (+0/-1706)
.pc/lp330571_dxteam_wired_connect_text.patch/src/applet-device-ethernet.c (+0/-655)
.pc/lp330608_dxteam_gsm_connect_text.patch/src/applet-device-broadband.c (+0/-1084)
.pc/lp330608_dxteam_gsm_connect_text.patch/src/applet-device-bt.c (+0/-379)
.pc/lp330608_dxteam_gsm_connect_text.patch/src/applet-device-cdma.c (+0/-756)
.pc/lp330608_dxteam_gsm_connect_text.patch/src/applet-device-gsm.c (+0/-1232)
.pc/lp330608_dxteam_gsm_connect_text.patch/src/applet-device-wimax.c (+0/-519)
.pc/lp341684_device_sensitive_disconnect_notify.patch/src/applet-device-wifi.c (+0/-1705)
.pc/lp341684_device_sensitive_disconnect_notify.patch/src/applet.c (+0/-3648)
.pc/lp341684_device_sensitive_disconnect_notify.patch/src/applet.h (+0/-335)
.pc/lp460144_correctly_update_notification.patch/src/applet.c (+0/-3781)
.pc/lp829673_gconf_hide_applet.patch/nm-applet.convert (+0/-7)
.pc/lp829673_gconf_hide_applet.patch/org.gnome.nm-applet.gschema.xml.in (+0/-47)
.pc/lp829673_gconf_hide_applet.patch/src/applet.c (+0/-3775)
.pc/lp829673_gconf_hide_applet.patch/src/applet.h (+0/-338)
.pc/make_menu_items_insensitive_based_on_permissions.patch/src/applet-device-cdma.c (+0/-795)
.pc/make_menu_items_insensitive_based_on_permissions.patch/src/applet-device-gsm.c (+0/-1275)
.pc/make_menu_items_insensitive_based_on_permissions.patch/src/applet-device-wifi.c (+0/-2012)
.pc/make_menu_items_insensitive_based_on_permissions.patch/src/applet.c (+0/-4110)
.pc/nm-applet-use-indicator.patch/configure.ac (+0/-278)
.pc/nm-applet-use-indicator.patch/src/Makefile.am (+0/-112)
.pc/nm-applet-use-indicator.patch/src/applet-device-broadband.c (+0/-1079)
.pc/nm-applet-use-indicator.patch/src/applet-device-bt.c (+0/-375)
.pc/nm-applet-use-indicator.patch/src/applet-device-cdma.c (+0/-751)
.pc/nm-applet-use-indicator.patch/src/applet-device-ethernet.c (+0/-651)
.pc/nm-applet-use-indicator.patch/src/applet-device-gsm.c (+0/-1227)
.pc/nm-applet-use-indicator.patch/src/applet-device-wifi.c (+0/-1706)
.pc/nm-applet-use-indicator.patch/src/applet-device-wimax.c (+0/-514)
.pc/nm-applet-use-indicator.patch/src/applet.c (+0/-3795)
.pc/nm-applet-use-indicator.patch/src/applet.h (+0/-341)
.pc/nm-applet-use-indicator.patch/src/gconf-helpers/Makefile.am (+0/-43)
.pc/nm-applet-use-indicator.patch/src/mb-menu-item.c (+0/-251)
.pc/nm-applet-use-indicator.patch/src/mobile-helpers.c (+0/-697)
.pc/nm-applet-use-indicator.patch/src/mobile-helpers.h (+0/-119)
.pc/position_dialogs_to_center_of_the_screen.patch/src/applet-dialogs.c (+0/-1428)
.pc/position_dialogs_to_center_of_the_screen.patch/src/utils/utils.c (+0/-211)
.pc/rebuild_menu_after_init.patch/src/applet.c (+0/-4197)
.pc/set_atk_relations.patch/src/applet-dialogs.c (+0/-1430)
.pc/ubuntu_dont_autostart_under_GNOME.patch/nm-applet.desktop.in (+0/-13)
NEWS (+17/-0)
configure (+20/-14)
configure.ac (+2/-10)
debian/changelog (+7/-0)
debian/patches/git_revert_system_ca_cert.patch (+0/-76)
debian/patches/git_use_paths_in_vpn_name_files_4867951.patch (+0/-74)
debian/patches/series (+0/-2)
m4/libtool.m4 (+2/-2)
nm-applet.convert (+0/-1)
nm-applet.desktop.in (+0/-1)
org.gnome.nm-applet.gschema.xml.in (+0/-5)
po/LINGUAS (+1/-0)
po/af.po (+2/-2)
po/an.po (+4/-4)
po/ar.po (+4/-4)
po/as.po (+4/-4)
po/ast.po (+3/-3)
po/be.po (+4/-4)
po/bg.po (+4/-4)
po/bn_IN.po (+3/-3)
po/ca.po (+4/-4)
po/ca@valencia.po (+4/-4)
po/crh.po (+4/-4)
po/cs.po (+2/-6)
po/da.po (+4/-4)
po/de.po (+4/-4)
po/el.po (+4/-4)
po/en_GB.po (+4/-4)
po/eo.po (+2/-2)
po/es.po (+4/-4)
po/et.po (+3/-3)
po/eu.po (+4/-4)
po/fa.po (+4/-4)
po/fi.po (+4/-4)
po/fr.po (+4/-4)
po/gd.po (+3733/-0)
po/gl.po (+4/-4)
po/gu.po (+4/-4)
po/he.po (+6/-2)
po/hi.po (+3/-3)
po/hu.po (+4/-4)
po/id.po (+127/-125)
po/it.po (+4/-4)
po/ja.po (+2/-2)
po/kk.po (+4/-4)
po/km.po (+4/-4)
po/kn.po (+4/-4)
po/ko.po (+3/-3)
po/ku.po (+3/-3)
po/lt.po (+3/-3)
po/lv.po (+4/-4)
po/mk.po (+2/-2)
po/ml.po (+4/-4)
po/mr.po (+3/-3)
po/ms.po (+4/-4)
po/nb.po (+4/-4)
po/nl.po (+4/-4)
po/nn.po (+4/-4)
po/or.po (+4/-4)
po/pa.po (+3/-3)
po/pl.po (+4/-4)
po/pt.po (+4/-4)
po/pt_BR.po (+4/-4)
po/ro.po (+4/-4)
po/ru.po (+4/-4)
po/sk.po (+5/-5)
po/sl.po (+4/-4)
po/sr.po (+4/-4)
po/sr@latin.po (+4/-4)
po/sv.po (+4/-4)
po/ta.po (+3/-4)
po/te.po (+3/-3)
po/tg.po (+2/-2)
po/th.po (+4/-4)
po/tr.po (+4/-4)
po/ug.po (+3/-3)
po/uk.po (+4/-4)
po/ur.po (+2/-2)
po/vi.po (+4/-4)
po/zh_CN.po (+4/-4)
po/zh_HK.po (+148/-144)
po/zh_TW.po (+85/-86)
src/Makefile.am (+0/-2)
src/applet-device-broadband.c (+12/-14)
src/applet-device-bt.c (+12/-13)
src/applet-device-cdma.c (+13/-83)
src/applet-device-ethernet.c (+12/-13)
src/applet-device-gsm.c (+16/-214)
src/applet-device-wifi.c (+19/-393)
src/applet-device-wimax.c (+16/-39)
src/applet-dialogs.c (+43/-202)
src/applet.c (+115/-667)
src/applet.h (+2/-24)
src/connection-editor/ce-page-bridge.ui (+1/-0)
src/connection-editor/ce-page.h (+0/-1)
src/connection-editor/ip4-routes-dialog.c (+3/-3)
src/connection-editor/ip6-routes-dialog.c (+3/-3)
src/connection-editor/new-connection.c (+0/-2)
src/connection-editor/page-bond.c (+0/-1)
src/connection-editor/page-bond.h (+0/-1)
src/connection-editor/page-bridge.c (+0/-1)
src/connection-editor/page-bridge.h (+0/-1)
src/connection-editor/page-dsl.c (+0/-1)
src/connection-editor/page-dsl.h (+0/-1)
src/connection-editor/page-ethernet.c (+0/-1)
src/connection-editor/page-ethernet.h (+0/-1)
src/connection-editor/page-infiniband.c (+0/-1)
src/connection-editor/page-infiniband.h (+0/-1)
src/connection-editor/page-ip4.c (+2/-2)
src/connection-editor/page-ip6.c (+2/-2)
src/connection-editor/page-mobile.c (+0/-11)
src/connection-editor/page-mobile.h (+0/-1)
src/connection-editor/page-vlan.c (+0/-1)
src/connection-editor/page-vlan.h (+0/-1)
src/connection-editor/page-vpn.c (+0/-11)
src/connection-editor/page-vpn.h (+0/-2)
src/connection-editor/page-wifi-security.c (+7/-2)
src/connection-editor/page-wifi.c (+0/-14)
src/connection-editor/page-wifi.h (+0/-1)
src/connection-editor/page-wimax.c (+0/-1)
src/connection-editor/page-wimax.h (+0/-1)
src/gconf-helpers/Makefile.am (+0/-2)
src/gnome-bluetooth/nma-bt-device.c (+0/-5)
src/libnm-gtk/nm-mobile-wizard.c (+0/-13)
src/libnm-gtk/nm-wifi-dialog.c (+2/-5)
src/main.c (+1/-1)
src/mb-menu-item.c (+0/-3)
src/mobile-helpers.c (+10/-153)
src/mobile-helpers.h (+0/-19)
src/utils/utils.c (+0/-9)
src/utils/utils.h (+0/-3)
src/wireless-security/eap-method.c (+3/-3)
src/wireless-security/ws-wep-key.c (+0/-7)
src/wireless-security/ws-wpa-psk.c (+8/-12)
Related source package recipes
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 121. By Mathieu Trudel-Lapierre
-
debian/
patches/ git_revert_ system_ ca_cert. patch: don't require system CA
certs to validate the wireless AP certs if the user chooses not to supply
a certificate. (LP: #1104476) - 120. By Tim Lunn
-
Bring back Autostart Condition, we don't want nm-applet running in a
gnome-shell session. (LP: #1315996) - 119. By Mathieu Trudel-Lapierre
-
* debian/
patches/ 11-user- connections. patch: Unbreak importing VPN
connections. (LP: #1294899)
* debian/patches/ git_use_ paths_in_ vpn_name_ files_4867951. patch: use the paths
specified in vpn .name files. - 118. By Mathieu Trudel-Lapierre
-
debian/control: drop gnome-bluetooth back to a Suggests. (LP: #1307485)
- 117. By Mathieu Trudel-Lapierre
-
debian/
patches/ 11-user- connections. patch: Allow users with access to modify
their own connection to create wireless connections without using
system-wide privileges. (LP: #1116317) - 116. By Luke Yelavich
-
debian/
patches/ set_atk_ relations. patch: Set label relationships in info
dialogs to better present information to Orca users. (LP: #1266302) - 115. By Mathieu Trudel-Lapierre
-
* New upstream release. (LP: #1276082)
- nm-applet: change logging to use g_debug
- applet: redo the gnome-shell interaction code (LP: #1267100)
- editor: do not gtk_widget_destroy( ) dialog on "close" signal
- nma-bt-device: fix creation of BT settings when creating connection
* debian/patches/ nm-applet- use-indicator. patch: refreshed
* debian/patches/ lp460144_ correctly_ update_ notification. patch: refreshed. - 113. By Mathieu Trudel-Lapierre
-
* debian/rules, debian/control: Enable ModemManager1 support.
* debian/patches/ nm-applet- use-indicator. patch: refresh patch for missing
update to the get_icon function for "broadband" devices used by MM1.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/utopic/network-manager-applet
