[meego-commits] 15145: Changes to MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks
Ying An Deng
no_reply at build.meego.com
Thu Mar 24 07:03:43 UTC 2011
Hi,
I have made the following changes to meego-panel-networks in project MeeGo:1.1:Netbook:Update:Testing. Please review and accept ASAP.
Thank You,
Ying An Deng
[This message was auto-generated]
---
Request #15145:
submit: home:yingan:branches:MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks(r2)(cleanup) -> MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks
Message:
update to 1.3.2 with backport for BMC13664
State: new 2011-03-24T00:03:36 yingan
Comment: None
changes files:
--------------
--- meego-panel-networks.changes
+++ meego-panel-networks.changes
@@ -1,2 +1,2 @@
-* Fri Nov 19 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.15
-- add patch: pane: Forward server cert to connman (BMC#8443)
+* Thu Mar 17 2011 Deng Ying An <ying.an.deng at intel.com> - 1.3.2
+- Port to MeeGo1.1 to fix Bug 13664
@@ -4,2 +4,38 @@
-* Mon Oct 18 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.15
-- add patch: Fix fallback information text (BMC#7544, BMC#5632)
+* Wed Feb 23 2011 Patrick McCarty <patrick.mccarty at linux.intel.com> - 1.3.2
+- Ensure a known string is returned when the service type name cannot
+ be determined. This fixes a problem with localization. (BMC#10549)
+
+* Fri Feb 15 2011 Jussi Kukkonen <jku at linux.intel.com> - 1.3.2
+- Update to changed Connman API (MBC#13527)
+
+* Fri Feb 11 2011 Anas Nashif <anas.nashif at intel.com> - 1.3.1
+- Adapt for renamed package mutter-netbook
+
+* Fri Dec 10 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.3.1
+- Fix remaining old Connman D-Bus names (MBC#11268)
+
+* Fri Dec 10 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.3.0
+- Depend on connman 0.64. There is no strict dependency but lower
+ connman versions (with the old D-Bus name) just won't be very useful,
+ as BMC#11144 clearly shows.
+
+* Fri Dec 10 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.3.0
+- Update Connman D-Bus name (BMC#11144)
+
+* Fri Nov 19 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.19
+- Add support for OpenConnect.ServerCert option (BMC#10328)
+
+* Tue Oct 12 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.18
+- Set Apply-button sensitivity smartly (BMC#2007)
+- Translations
+
+* Tue Oct 12 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.17
+- input validation for "add new connection" (BMC#308, BMC#4019)
+- Only show "Log In" button for portal services (BMC#8306)
+
+* Mon Oct 11 2010 Jussi Kukkonen <jku at linux.intel.com> - 1.2.16
+- keep "active" service item visible (BMC#169)
+- make service drag-n-drop smarter (BMC#3770)
+- scroll list to show expanded item (MBC#2449)
+- Only show error messages once (MBC#655)
+- Initial support for captive portals (BMC#3198)
old:
----
0001-list-Fix-fallback-information-text-MBC-7544-MBC-5632.patch
0002-pane-Forward-server-cert-to-connman-BMC-8443.patch
meego-panel-networks-1.2.15.tar.gz
new:
----
meego-panel-networks-1.3.2.tar.gz
meego-panel-networks_backport.patch
service-type-fixed-string.patch
spec files:
-----------
--- meego-panel-networks.spec
+++ meego-panel-networks.spec
@@ -1,23 +1,24 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.20
+# Generated by: spectacle version 0.21
#
# >> macros
# << macros
Name: meego-panel-networks
Summary: Connection management panel
-Version: 1.2.15
+Version: 1.3.2
Release: 1
Group: Applications/Internet
License: GPL 2
URL: http://www.meego.org
Source0: %{name}-%{version}.tar.gz
Source100: meego-panel-networks.yaml
-Patch0: 0001-list-Fix-fallback-information-text-MBC-7544-MBC-5632.patch
-Patch1: 0002-pane-Forward-server-cert-to-connman-BMC-8443.patch
+Patch0: service-type-fixed-string.patch
+Patch1: meego-panel-networks_backport.patch
Requires: mobile-broadband-provider-info
Requires: iso-codes
+Requires: connman >= 0.69
Requires(post): /bin/touch
Requires(post): gtk2
BuildRequires: pkgconfig(gtk+-2.0)
@@ -36,16 +37,16 @@
%description
-A connection management panel for Mutter-Meego.
+meego-panel-networks is a connection management panel for Mutter-Meego.
%prep
%setup -q -n %{name}-%{version}
-# 0001-list-Fix-fallback-information-text-MBC-7544-MBC-5632.patch
+# service-type-fixed-string.patch
%patch0 -p1
-# 0002-pane-Forward-server-cert-to-connman-BMC-8443.patch
+# meego-panel-networks_backport.patch
%patch1 -p1
# >> setup
# << setup
other changes:
--------------
++++++ meego-panel-networks-1.2.15.tar.gz -> meego-panel-networks-1.3.2.tar.gz
20374 lines of diff (skipped)
++++++ meego-panel-networks.yaml
--- meego-panel-networks.yaml
+++ meego-panel-networks.yaml
@@ -1,20 +1,23 @@
Name: meego-panel-networks
Summary: Connection management panel
-Version: 1.2.15
+Version: 1.3.2
Release: 1
Group: Applications/Internet
License: GPL 2
URL: http://www.meego.org
+
+Patches:
+ - service-type-fixed-string.patch
+ - meego-panel-networks_backport.patch
+
Sources:
- "%{name}-%{version}.tar.gz"
-Patches:
- - 0001-list-Fix-fallback-information-text-MBC-7544-MBC-5632.patch
- - 0002-pane-Forward-server-cert-to-connman-BMC-8443.patch
-Description: A connection management panel for Mutter-Meego.
+Description: meego-panel-networks is a connection management panel for Mutter-Meego.
Requires:
- mobile-broadband-provider-info
- iso-codes
+ - connman >= 0.69
PkgBR:
- intltool
- gnome-common
++++++ meego-panel-networks_backport.patch (new)
--- meego-panel-networks_backport.patch
+++ meego-panel-networks_backport.patch
+diff -aurN meego-panel-networks-1.3.2_a/callouts/3g/ggg-service.c meego-panel-networks-1.3.2_b/callouts/3g/ggg-service.c
+--- meego-panel-networks-1.3.2_a/callouts/3g/ggg-service.c 2011-03-22 10:58:41.018734686 +0800
++++ meego-panel-networks-1.3.2_b/callouts/3g/ggg-service.c 2011-03-22 13:30:22.605735700 +0800
+@@ -26,7 +26,7 @@
+ #include "carrick/connman-service-bindings.h"
+ #include "ggg-service.h"
+
+-#define CONNMAN_SERVICE "net.connman"
++#define CONNMAN_SERVICE "org.moblin.connman"
+ #define CONNMAN_MANAGER_PATH "/"
+ #define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
+ #define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
+@@ -104,7 +104,7 @@
+ path,
+ CONNMAN_SERVICE_INTERFACE);
+
+- if (!net_connman_Service_get_properties (proxy, &props, &error)) {
++ if (!org_moblin_connman_Service_get_properties (proxy, &props, &error)) {
+ g_printerr ("Cannot get properties for service: %s\n", error->message);
+ g_error_free (error);
+ g_object_unref (proxy);
+@@ -189,7 +189,7 @@
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_static_string (&value, string);
+
+- if (!net_connman_Service_set_property (proxy, name, &value, &error)) {
++ if (!org_moblin_connman_Service_set_property (proxy, name, &value, &error)) {
+ g_printerr ("Cannot set property %s to %s: %s\n",
+ name, string, error->message);
+ g_error_free (error);
+@@ -220,7 +220,7 @@
+ GError *error = NULL;
+
+ if (service->priv->proxy) {
+- if (!net_connman_Service_connect (service->priv->proxy, &error)) {
++ if (!org_moblin_connman_Service_connect (service->priv->proxy, &error)) {
+ g_printerr ("Cannot connect: %s\n", error->message);
+ g_error_free (error);
+ }
+diff -aurN meego-panel-networks-1.3.2_a/callouts/3g/main.c meego-panel-networks-1.3.2_b/callouts/3g/main.c
+--- meego-panel-networks-1.3.2_a/callouts/3g/main.c 2011-03-22 10:58:41.017734662 +0800
++++ meego-panel-networks-1.3.2_b/callouts/3g/main.c 2011-03-22 13:30:22.605735700 +0800
+@@ -36,7 +36,7 @@
+
+ #include "carrick/connman-manager-bindings.h"
+
+-#define CONNMAN_SERVICE "net.connman"
++#define CONNMAN_SERVICE "org.moblin.connman"
+ #define CONNMAN_MANAGER_PATH "/"
+ #define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
+ #define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
+@@ -257,7 +257,7 @@
+ CONNMAN_SERVICE, "/",
+ CONNMAN_MANAGER_INTERFACE);
+
+- if (!net_connman_Manager_get_properties (proxy, &props, &error)) {
++ if (!org_moblin_connman_Manager_get_properties (proxy, &props, &error)) {
+ g_printerr ("Cannot get properties for manager: %s\n", error->message);
+ g_error_free (error);
+ g_object_unref (proxy);
+diff -aurN meego-panel-networks-1.3.2_a/carrick/carrick-list.c meego-panel-networks-1.3.2_b/carrick/carrick-list.c
+--- meego-panel-networks-1.3.2_a/carrick/carrick-list.c 2011-03-22 10:58:41.031984713 +0800
++++ meego-panel-networks-1.3.2_b/carrick/carrick-list.c 2011-03-22 13:30:22.617734979 +0800
+@@ -267,7 +267,7 @@
+ (CARRICK_SERVICE_ITEM (other_widget));
+ path = dbus_g_proxy_get_path (other_service);
+
+- net_connman_Service_move_before_async (service,
++ org_moblin_connman_Service_move_before_async (service,
+ path,
+ move_notify_cb,
+ data);
+@@ -281,7 +281,7 @@
+ (CARRICK_SERVICE_ITEM (other_widget));
+ path = dbus_g_proxy_get_path (other_service);
+
+- net_connman_Service_move_after_async (service,
++ org_moblin_connman_Service_move_after_async (service,
+ path,
+ move_notify_cb,
+ data);
+@@ -812,7 +812,7 @@
+ "PropertyChanged",
+ G_CALLBACK (_mngr_property_changed_cb),
+ list, NULL);
+- net_connman_Manager_get_properties_async (manager,
++ org_moblin_connman_Manager_get_properties_async (manager,
+ _mngr_get_properties_cb,
+ list);
+
+diff -aurN meego-panel-networks-1.3.2_a/carrick/carrick-network-model.c meego-panel-networks-1.3.2_b/carrick/carrick-network-model.c
+--- meego-panel-networks-1.3.2_a/carrick/carrick-network-model.c 2011-03-22 10:58:41.033985344 +0800
++++ meego-panel-networks-1.3.2_b/carrick/carrick-network-model.c 2011-03-22 13:30:22.619735245 +0800
+@@ -94,7 +94,7 @@
+ self,
+ NULL);
+
+- net_connman_Manager_get_properties_async
++ org_moblin_connman_Manager_get_properties_async
+ (priv->manager,
+ network_model_manager_get_properties_cb,
+ self);
+@@ -512,7 +512,7 @@
+ if (g_strcmp0 (type, "vpn") == 0 &&
+ (g_strcmp0 (state, "idle") == 0 ||
+ g_strcmp0 (state, "failure") == 0))
+- net_connman_Manager_remove_provider_async (self->priv->manager,
++ org_moblin_connman_Manager_remove_provider_async (self->priv->manager,
+ dbus_g_proxy_get_path (service),
+ remove_provider_cb,
+ self);
+@@ -541,7 +541,7 @@
+ /* Rather than store this property we're just going to trigger
+ * GetProperties to pull the up-to-date passphrase
+ */
+- net_connman_Service_get_properties_async
++ org_moblin_connman_Service_get_properties_async
+ (service,
+ network_model_service_get_properties_cb,
+ self);
+@@ -749,7 +749,7 @@
+ self,
+ NULL);
+
+- net_connman_Service_get_properties_async
++ org_moblin_connman_Service_get_properties_async
+ (service,
+ network_model_service_get_properties_cb,
+ self);
+diff -aurN meego-panel-networks-1.3.2_a/carrick/carrick-network-model.h meego-panel-networks-1.3.2_b/carrick/carrick-network-model.h
+--- meego-panel-networks-1.3.2_a/carrick/carrick-network-model.h 2011-03-22 10:58:41.033985344 +0800
++++ meego-panel-networks-1.3.2_b/carrick/carrick-network-model.h 2011-03-22 13:30:22.619735245 +0800
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include <dbus/dbus-glib.h>
+
+-#define CONNMAN_SERVICE "net.connman"
++#define CONNMAN_SERVICE "org.moblin.connman"
+ #define CONNMAN_MANAGER_PATH "/"
+ #define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
+ #define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
+diff -aurN meego-panel-networks-1.3.2_a/carrick/carrick-pane.c meego-panel-networks-1.3.2_b/carrick/carrick-pane.c
+--- meego-panel-networks-1.3.2_a/carrick/carrick-pane.c 2011-03-22 10:58:41.034985341 +0800
++++ meego-panel-networks-1.3.2_b/carrick/carrick-pane.c 2011-03-22 13:30:22.619735245 +0800
+@@ -368,7 +368,7 @@
+ "wifi",
+ "ready",
+ "all");
+- net_connman_Manager_enable_technology_async (priv->manager,
++ org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ "wifi",
+ wifi_switch_notify_cb,
+ pane);
+@@ -379,7 +379,7 @@
+ "wifi",
+ "idle",
+ "all");
+- net_connman_Manager_disable_technology_async (priv->manager,
++ org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ "wifi",
+ wifi_switch_notify_cb,
+ pane);
+@@ -429,7 +429,7 @@
+ "ethernet",
+ "ready",
+ "all");
+- net_connman_Manager_enable_technology_async (priv->manager,
++ org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ "ethernet",
+ ethernet_switch_notify_cb,
+ pane);
+@@ -440,7 +440,7 @@
+ "ethernet",
+ "idle",
+ "all");
+- net_connman_Manager_disable_technology_async (priv->manager,
++ org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ "ethernet",
+ ethernet_switch_notify_cb,
+ pane);
+@@ -490,7 +490,7 @@
+ "cellular",
+ "ready",
+ "all");
+- net_connman_Manager_enable_technology_async (priv->manager,
++ org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ "cellular",
+ threeg_switch_notify_cb,
+ pane);
+@@ -501,7 +501,7 @@
+ "cellular",
+ "idle",
+ "all");
+- net_connman_Manager_disable_technology_async (priv->manager,
++ org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ "cellular",
+ threeg_switch_notify_cb,
+ pane);
(979 more lines skipped)
++++++ service-type-fixed-string.patch (new)
--- service-type-fixed-string.patch
+++ service-type-fixed-string.patch
+diff --git a/carrick/carrick-util.c b/carrick/carrick-util.c
+index 074ec7c..cceb874 100644
+--- a/carrick/carrick-util.c
++++ b/carrick/carrick-util.c
+@@ -47,8 +47,9 @@ util_get_service_type_for_display (const char *type)
+ else if (g_strcmp0 (type, "vpn") == 0)
+ return _("VPN");
+ else
+- /* Run it through gettext and hope for the best */
+- return _(type);
++ /* Translator note: This is the fallback service type name
++ * used when the name cannot be determined. */
++ return _("unknown");
+ }
+
+
++++++ deleted files:
--- 0001-list-Fix-fallback-information-text-MBC-7544-MBC-5632.patch
--- 0002-pane-Forward-server-cert-to-connman-BMC-8443.patch
More information about the MeeGo-commits
mailing list