diff -Nru econnman-0.0.1~201309080010/data/desktop/econnman-agent.desktop econnman-0.0.1~201312021629/data/desktop/econnman-agent.desktop --- econnman-0.0.1~201309080010/data/desktop/econnman-agent.desktop 2013-04-14 15:39:13.000000000 +0000 +++ econnman-0.0.1~201312021629/data/desktop/econnman-agent.desktop 2013-11-22 20:22:04.000000000 +0000 @@ -6,16 +6,19 @@ Name[es]=EConnMan con agente Name[gl]=EConnMan con axente Name[it]=EconnMan con agente +Name[pl]=EconnMan z Agentem Name[pt]=EconnMan com agente GenericName=Connection Manager GenericName[es]=Administrador de conexiones GenericName[gl]=Xestor de conexións +GenericName[pl]=Menadżer Połączeń GenericName[pt]=Gestor de ligações Comment=Manage your internet connections using ConnMan and EFL. Version with agent to get passwords and other input. Comment[eo]=Administri viajn interretajn konektadojn pere de ConnMan kaj EFL. Versio kun agento por akiri pasvortojn aŭ aliajn enigojn. Comment[es]=Administre sus conexiones a internet usando ConnMan y EFL. Versión con agente para obtener contraseñas y otras entradas. Comment[gl]=Xestione as súas conexións a internet empregando ConnMan e EFL. Versión con axente para obter contrasinais e outras entradas. Comment[it]=Gestisce le connessioni internet usando ConnMan e le EFL. Versione con agente per password e altri input. +Comment[pl]=Zarządzaj połączeniami z Internetem z użyciem ConnMan i EFL. Wersja z agentem umożliwia używanie haseł i innych parametrów. Comment[pt]=Gestão das ligações internet com o ConnMan e o EFL. Versão com agente para obter senhas e outros dados Categories=Network;Settings;Enlightenment; Exec=econnman-bin --agent diff -Nru econnman-0.0.1~201309080010/data/desktop/econnman.desktop econnman-0.0.1~201312021629/data/desktop/econnman.desktop --- econnman-0.0.1~201309080010/data/desktop/econnman.desktop 2013-04-14 15:39:13.000000000 +0000 +++ econnman-0.0.1~201312021629/data/desktop/econnman.desktop 2013-11-22 20:22:04.000000000 +0000 @@ -6,12 +6,14 @@ GenericName[eo]=Administrilo de konektadoj GenericName[es]=Administrador de conexiones GenericName[gl]=Xestor de conexións +GenericName[pl]=Menadżer Połączeń GenericName[pt]=Gestor de ligações Comment=Manage your internet connections using ConnMan and EFL Comment[eo]=Administri viajn interretajn konektadoj pere de ConnMan kaj EFL. Comment[es]=Administre sus conexiones a internet usando ConnMan y EFL. Comment[gl]=Xestione as súas conexións a internet empregando ConnMan e EFL. Comment[it]=Gestisce le connessioni internet usando ConnMan e le EFL. +Comment[pl]=Zarządzaj połączeniami z Internetem z użyciem ConnMan i EFL. Comment[pt]=Gestão de ligações internet com o ConnMan e o EFL Categories=Network;Settings;Enlightenment; Exec=econnman-bin diff -Nru econnman-0.0.1~201309080010/debian/changelog econnman-0.0.1~201312021629/debian/changelog --- econnman-0.0.1~201309080010/debian/changelog 2013-09-07 20:11:07.000000000 +0000 +++ econnman-0.0.1~201312021629/debian/changelog 2013-12-02 12:30:02.000000000 +0000 @@ -1,4 +1,4 @@ -econnman (0.0.1~201309080010-1ppa1~raring) raring; urgency=high +econnman (0.0.1~201312021629-1ppa1~raring) raring; urgency=high * Autobuild. diff -Nru econnman-0.0.1~201309080010/econnman-bin.in econnman-0.0.1~201312021629/econnman-bin.in --- econnman-0.0.1~201309080010/econnman-bin.in 2013-04-14 15:39:13.000000000 +0000 +++ econnman-0.0.1~201312021629/econnman-bin.in 2013-11-22 20:22:04.000000000 +0000 @@ -20,14 +20,18 @@ import efl.edje as edje from efl.dbus_mainloop import DBusEcoreMainLoop import efl.elementary as elm - from efl.elementary.window import Window + from efl.elementary import ELM_POLICY_QUIT, \ + ELM_POLICY_QUIT_LAST_WINDOW_CLOSED + from efl.elementary.window import Window, ELM_WIN_BASIC, \ + ELM_WIN_DIALOG_BASIC from efl.elementary.background import Background from efl.elementary.box import Box from efl.elementary.label import Label from efl.elementary.naviframe import Naviframe from efl.elementary.popup import Popup from efl.elementary.button import Button - from efl.elementary.scroller import Scroller + from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_OFF, \ + ELM_SCROLLER_POLICY_AUTO from efl.elementary.check import Check from efl.elementary.progressbar import Progressbar from efl.elementary.genlist import Genlist, GenlistItemClass @@ -36,13 +40,16 @@ from efl.elementary.entry import Entry from efl.elementary.icon import Icon from efl.elementary.layout import Layout + from efl.elementary.theme import Theme except: import elementary as elm import evas, e_dbus, ecore, edje from e_dbus import DBusEcoreMainLoop from elementary import Window, Background, Box, Label, Naviframe, Popup, \ Button, Scroller, Check, Progressbar, Genlist, GenlistItemClass, \ - SegmentControl, Frame, Entry, Icon, Layout + SegmentControl, Frame, Entry, Icon, Layout, Theme, ELM_WIN_BASIC, \ + ELM_WIN_DIALOG_BASIC, ELM_POLICY_QUIT, ELM_SCROLLER_POLICY_OFF, \ + ELM_SCROLLER_POLICY_AUTO, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED dbus_ml = DBusEcoreMainLoop() @@ -81,7 +88,7 @@ def dbus_dict_to_str(d): "Help debug by converting a dbus.Dictionary to a string in a shorter form." s = [] - for k, v in d.iteritems(): + for k, v in d.items(): s.append("%s=%s" % (k, dbus_variant_to_str(v))) return ", ".join(s) @@ -125,8 +132,8 @@ self.obj = Scroller(parent) self.obj.on_del_add(self._deleted) self.obj.size_hint_weight = EXPAND_BOTH - self.obj.policy_set(elm.ELM_SCROLLER_POLICY_OFF, - elm.ELM_SCROLLER_POLICY_AUTO) + self.obj.policy_set(ELM_SCROLLER_POLICY_OFF, + ELM_SCROLLER_POLICY_AUTO) self.obj.bounce_set(False, True) self.obj.content_min_limit(True, False) @@ -253,7 +260,7 @@ self.obj.on_del_add(self._deleted) def on_reply(properties): - for name, value in properties.iteritems(): + for name, value in properties.items(): log.debug("property %s: %s", name, value) self._property_changed(name, value) @@ -596,7 +603,7 @@ def _service_changed(self, path, properties): log.debug("Changed %s: %s", path, dbus_dict_to_str(properties)) d = self.services[path] - for k, v in properties.iteritems(): + for k, v in properties.items(): d[k] = v def _services_changed(self, changed, removed): @@ -963,7 +970,7 @@ value = bool(value) self.immutable = value self.auto_connect.disabled = value - for w in self.readwrite_list_widget.itervalues(): + for w in self.readwrite_list_widget.values(): w.disabled = value self.ipv4_method.disabled = value self.ipv4_address.disabled = value @@ -1155,7 +1162,7 @@ conf = self.ipv4_properties["IPv4.Configuration"] changed = [] - for k, v in new.iteritems(): + for k, v in new.items(): if conf.get(k) != v: changed.append(k) log.debug("Changed IPv4: %s", ", ".join(changed)) @@ -1347,7 +1354,7 @@ def on_clicked(obj): response = {} keys = [] - for name, en in widgets.iteritems(): + for name, en in widgets.items(): conv = self.request_type_conv.get(name, dbus.String) v = conv(en.text) if v: @@ -1359,7 +1366,7 @@ on_done(response) w.delete() - self.dialog = w = Window("econnman-agent", elm.ELM_WIN_DIALOG_BASIC) + self.dialog = w = Window("econnman-agent", ELM_WIN_DIALOG_BASIC) w.title = "ConnMan Requested Input" w.icon_name = "econnman" w.autodel = True @@ -1394,7 +1401,7 @@ bx.pack_end(lb) widgets = {} - for name, desc in fields.iteritems(): + for name, desc in fields.items(): decos = "" t = desc.get("Type") if t and t != "informational": @@ -1480,13 +1487,13 @@ log.setLevel(level) elm.init() - elm.policy_set(elm.ELM_POLICY_QUIT, elm.ELM_POLICY_QUIT_LAST_WINDOW_CLOSED) + elm.policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED) for td in ("./data/theme/default.edj", "@PKGDATADIR@/theme/default.edj"): if os.path.exists(td): - elm.theme_extension_add(td) + Theme(default=True).extension_add(td) - win = Window("econnman", elm.ELM_WIN_BASIC) + win = Window("econnman", ELM_WIN_BASIC) win.title = "EConnMan" win.icon_name = "econnman" win.autodel = True