[network-manager-netbook: 67/67] Merge branch 'MplPanelClient'
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-netbook: 67/67] Merge branch 'MplPanelClient'
- Date: Wed, 2 Dec 2009 14:48:46 +0000 (UTC)
commit c141f71759fe55e9461464867032446c896d177f
Merge: 654bc4c... 3e7ee8e...
Author: Tambet Ingo <tambet gmail com>
Date: Wed Dec 2 16:46:50 2009 +0200
Merge branch 'MplPanelClient'
Conflicts:
po/cs.po
Sorry if I accidentally lost some translations while resolving conflicts.
.gitignore | 9 +-
Makefile.am | 33 +-
configure.in | 12 +-
icons/Makefile.am | 4 +-
icons/toolbar-button-active.png | Bin 0 -> 3053 bytes
icons/toolbar-button-hover.png | Bin 0 -> 3035 bytes
libnm-gtk/.gitignore | 1 +
libnm-gtk/Makefile.am | 95 +
{src/gconf-helpers => libnm-gtk}/gconf-helpers.c | 1611 ++++++++++++-----
{src/gconf-helpers => libnm-gtk}/gconf-helpers.h | 82 +-
libnm-gtk/gconf-upgrade.c | 1993 ++++++++++++++++++++
libnm-gtk/gconf-upgrade.h | 56 +
libnm-gtk/nm-cdma-item.c | 76 +
libnm-gtk/nm-cdma-item.h | 52 +
libnm-gtk/nm-cdma-provider.c | 71 +
libnm-gtk/nm-cdma-provider.h | 51 +
libnm-gtk/nm-connection-item.c | 390 ++++
libnm-gtk/nm-connection-item.h | 61 +
libnm-gtk/nm-connection-list.c | 263 +++
libnm-gtk/nm-connection-list.h | 54 +
libnm-gtk/nm-connection-model.c | 203 ++
libnm-gtk/nm-connection-model.h | 60 +
libnm-gtk/nm-device-handler.c | 259 +++
libnm-gtk/nm-device-handler.h | 60 +
libnm-gtk/nm-device-item.c | 176 ++
libnm-gtk/nm-device-item.h | 55 +
libnm-gtk/nm-device-model.c | 266 +++
libnm-gtk/nm-device-model.h | 61 +
libnm-gtk/nm-device-provider.c | 152 ++
libnm-gtk/nm-device-provider.h | 59 +
libnm-gtk/nm-ethernet-item.c | 116 ++
libnm-gtk/nm-ethernet-item.h | 52 +
libnm-gtk/nm-ethernet-provider.c | 71 +
libnm-gtk/nm-ethernet-provider.h | 51 +
libnm-gtk/nm-gconf-connection.c | 1001 ++++++++++
libnm-gtk/nm-gconf-connection.h | 78 +
libnm-gtk/nm-gconf-settings.c | 461 +++++
libnm-gtk/nm-gconf-settings.h | 64 +
libnm-gtk/nm-gsm-item.c | 76 +
libnm-gtk/nm-gsm-item.h | 52 +
libnm-gtk/nm-gsm-provider.c | 71 +
libnm-gtk/nm-gsm-provider.h | 51 +
src/nmn-icon-cache.c => libnm-gtk/nm-icon-cache.c | 37 +-
src/nmn-icon-cache.h => libnm-gtk/nm-icon-cache.h | 10 +-
libnm-gtk/nm-item-provider.c | 303 +++
libnm-gtk/nm-item-provider.h | 79 +
libnm-gtk/nm-list-item.c | 343 ++++
libnm-gtk/nm-list-item.h | 93 +
libnm-gtk/nm-list-model.c | 314 +++
libnm-gtk/nm-list-model.h | 67 +
libnm-gtk/nm-status-icon.c | 244 +++
libnm-gtk/nm-status-icon.h | 51 +
libnm-gtk/nm-status-model.c | 126 ++
libnm-gtk/nm-status-model.h | 55 +
libnm-gtk/nm-wifi-item.c | 592 ++++++
libnm-gtk/nm-wifi-item.h | 63 +
libnm-gtk/nm-wifi-provider.c | 227 +++
libnm-gtk/nm-wifi-provider.h | 51 +
libnm-gtk/test.c | 224 +++
{src/gconf-helpers => libnm-gtk}/utils.c | 282 ++--
{src/gconf-helpers => libnm-gtk}/utils.h | 11 +-
{src => libnm-gtk}/wireless-dialog.c | 19 +-
{src => libnm-gtk}/wireless-dialog.h | 0
.../wireless-helper.h | 23 +-
{src => libnm-gtk}/wireless-security.ui | 0
{src => libnm-gtk}/wireless-security/Makefile.am | 8 +-
.../wireless-security/ca-nag-dialog.ui | 0
.../wireless-security/dynamic-wep.ui | 0
{src => libnm-gtk}/wireless-security/eap-leap.ui | 0
.../wireless-security/eap-method-leap.c | 0
.../wireless-security/eap-method-leap.h | 0
.../wireless-security/eap-method-peap.c | 36 +-
.../wireless-security/eap-method-peap.h | 0
.../wireless-security/eap-method-simple.c | 0
.../wireless-security/eap-method-simple.h | 0
.../wireless-security/eap-method-tls.c | 137 +-
.../wireless-security/eap-method-tls.h | 0
.../wireless-security/eap-method-ttls.c | 36 +-
.../wireless-security/eap-method-ttls.h | 0
{src => libnm-gtk}/wireless-security/eap-method.c | 17 +-
{src => libnm-gtk}/wireless-security/eap-method.h | 3 +-
{src => libnm-gtk}/wireless-security/eap-peap.ui | 0
{src => libnm-gtk}/wireless-security/eap-simple.ui | 0
{src => libnm-gtk}/wireless-security/eap-tls.ui | 0
{src => libnm-gtk}/wireless-security/eap-ttls.ui | 0
{src => libnm-gtk}/wireless-security/helpers.c | 25 +-
{src => libnm-gtk}/wireless-security/helpers.h | 0
{src => libnm-gtk}/wireless-security/leap.ui | 0
{src => libnm-gtk}/wireless-security/wep-key.ui | 0
.../wireless-security/wireless-security.c | 0
.../wireless-security/wireless-security.h | 0
{src => libnm-gtk}/wireless-security/wpa-eap.ui | 0
{src => libnm-gtk}/wireless-security/wpa-psk.ui | 0
.../wireless-security/ws-dynamic-wep.c | 0
.../wireless-security/ws-dynamic-wep.h | 0
{src => libnm-gtk}/wireless-security/ws-leap.c | 1 -
{src => libnm-gtk}/wireless-security/ws-leap.h | 0
{src => libnm-gtk}/wireless-security/ws-wep-key.c | 202 +--
{src => libnm-gtk}/wireless-security/ws-wep-key.h | 11 +-
{src => libnm-gtk}/wireless-security/ws-wpa-eap.c | 0
{src => libnm-gtk}/wireless-security/ws-wpa-eap.h | 0
{src => libnm-gtk}/wireless-security/ws-wpa-psk.c | 22 +-
{src => libnm-gtk}/wireless-security/ws-wpa-psk.h | 0
marshallers/.gitignore | 2 +
{src/marshallers => marshallers}/Makefile.am | 0
.../marshallers => marshallers}/nma-marshal-main.c | 0
marshallers/nma-marshal.list | 7 +
network-manager-netbook.css.in | 123 ++
...k.desktop => network-manager-netbook.desktop.in | 2 +-
org.moblin.UX.Shell.Panels.network.service.in | 3 +
po/.gitignore | 2 +
po/POTFILES.in | 52 +-
po/ar.po | 593 ++++---
po/cs.po | 670 ++++---
po/de.po | 615 ++++---
po/el.po | 604 ++++---
po/es.po | 605 ++++---
po/et.po | 477 ++++--
po/fi.po | 600 ++++---
po/fr.po | 602 ++++---
po/gu.po | 585 ++++---
po/hu.po | 601 ++++---
po/id.po | 623 ++++---
po/it.po | 601 ++++---
po/ja.po | 598 ++++---
po/ko.po | 592 ++++---
po/nl.po | 601 ++++---
po/pa.po | 589 ++++---
po/pl.po | 600 ++++---
po/pt_BR.po | 601 ++++---
po/ru.po | 600 ++++---
po/sv.po | 621 ++++---
po/tr.po | 599 ++++---
po/uk.po | 601 ++++---
po/zh_CN.po | 589 ++++---
po/zh_TW.po | 589 ++++---
src/.gitignore | 1 +
src/Makefile.am | 67 +-
src/gconf-helpers/Makefile.am | 20 -
src/gconf-helpers/nma-gconf-connection.c | 557 ------
src/gconf-helpers/nma-gconf-connection.h | 54 -
src/gconf-helpers/nma-gconf-settings.c | 433 -----
src/gconf-helpers/nma-gconf-settings.h | 54 -
src/main.c | 85 +-
src/marshallers/nma-marshal.list | 4 -
src/moblin-netbook-system-tray.h | 221 ---
src/nbtk-gtk-light-switch.c | 412 ----
src/nbtk-gtk-light-switch.h | 62 -
src/network-manager-netbook.ui | 371 ----
src/nmn-applet.c | 483 +++--
src/nmn-applet.h | 16 +-
src/nmn-device-handler.c | 375 ----
src/nmn-device-handler.h | 73 -
src/nmn-ethernet-handler.c | 191 --
src/nmn-ethernet-handler.h | 47 -
src/nmn-ethernet-item.c | 182 --
src/nmn-ethernet-item.h | 47 -
src/nmn-item-renderer.c | 445 +++++
src/nmn-item-renderer.h | 51 +
src/nmn-item.c | 151 --
src/nmn-item.h | 62 -
src/nmn-list.c | 552 +++---
src/nmn-list.h | 10 +-
src/nmn-model.c | 494 +++++
src/nmn-model.h | 80 +
src/nmn-network-item.c | 907 ---------
src/nmn-network-item.h | 104 -
src/nmn-networks.c | 472 -----
src/nmn-networks.h | 48 -
src/nmn-new-connection.c | 281 ++--
src/nmn-new-connection.h | 12 +-
src/nmn-nm-data.c | 327 ----
src/nmn-nm-data.h | 79 -
src/nmn-panel-client.c | 388 ++++
src/nmn-panel-client.h | 52 +
src/nmn-plug.c | 123 --
src/nmn-plug.h | 48 -
src/nmn-serial-handler.c | 137 --
src/nmn-serial-handler.h | 47 -
src/nmn-serial-item.c | 157 --
src/nmn-serial-item.h | 47 -
src/nmn-status-icon.c | 467 -----
src/nmn-status-icon.h | 54 -
src/nmn-text-item.c | 102 -
src/nmn-text-item.h | 44 -
src/nmn-wifi-handler.c | 380 ----
src/nmn-wifi-handler.h | 47 -
src/nmn-wifi-item.c | 766 --------
src/nmn-wifi-item.h | 59 -
src/nmn-wifi-list.c | 428 -----
src/nmn-wifi-list.h | 50 -
src/utils.c | 871 +---------
src/utils.h | 60 +-
src/wireless-security/sha1.c | 692 -------
src/wireless-security/sha1.h | 34 -
195 files changed, 22594 insertions(+), 16957 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
