diff -u sugar-0.82.0/debian/changelog sugar-0.82.0/debian/changelog --- sugar-0.82.0/debian/changelog +++ sugar-0.82.0/debian/changelog @@ -1,3 +1,11 @@ +sugar (0.82.0-1ubuntu4) intrepid; urgency=low + + * Disable "Radio" in the sugar-control-panel, (LP: #287028) + * Rename "Mesh" to "Collaboration" in Network control panel + (OLPC #8623) + + -- Luke Faraone Tue, 21 Oct 2008 17:19:19 -0400 + sugar (0.82.0-1ubuntu3) intrepid; urgency=low * Add /usr/share/activities/ to the search path to work around issue diff -u sugar-0.82.0/debian/patches/series sugar-0.82.0/debian/patches/series --- sugar-0.82.0/debian/patches/series +++ sugar-0.82.0/debian/patches/series @@ -5,2 +5,3 @@ 2005_look_in_usr_share_activities.patch +2006_fix_control_panel_network.patch 2991_enable_danish_l10n.patch only in patch2: unchanged: --- sugar-0.82.0.orig/debian/patches/2006_fix_control_panel_network.patch +++ sugar-0.82.0/debian/patches/2006_fix_control_panel_network.patch @@ -0,0 +1,171 @@ +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sugar/+bug/287028 +# Upstream: http://dev.laptop.org/ticket/8862 +# Description: Remove Radio section from Network control panel - XO specific +# +--- sugar-0.82.0.orig/src/controlpanel/view/network.py ++++ sugar-0.82.0/src/controlpanel/view/network.py +@@ -13,6 +13,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++# ++## Distribution changes: ++## UBUNTU: Commented out radio code, we don't use it and it ++## produces an error. Also, apply olpc:8623 ++ + + import gtk + import gobject +@@ -35,70 +40,78 @@ + self.restart_alerts = alerts + self._jabber_sid = 0 + self._jabber_valid = True +- self._radio_valid = True ++ #self._radio_valid = True + self._jabber_change_handler = None +- self._radio_change_handler = None ++ #self._radio_change_handler = None + + self.set_border_width(style.DEFAULT_SPACING * 2) + self.set_spacing(style.DEFAULT_SPACING) + group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + +- self._radio_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) ++ #self._radio_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + self._jabber_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING) + +- separator_wireless = gtk.HSeparator() +- self.pack_start(separator_wireless, expand=False) +- separator_wireless.show() +- +- label_wireless = gtk.Label(_('Wireless')) +- label_wireless.set_alignment(0, 0) +- self.pack_start(label_wireless, expand=False) +- label_wireless.show() +- box_wireless = gtk.VBox() +- box_wireless.set_border_width(style.DEFAULT_SPACING * 2) +- box_wireless.set_spacing(style.DEFAULT_SPACING) +- box_radio = gtk.HBox(spacing=style.DEFAULT_SPACING) +- label_radio = gtk.Label(_('Radio:')) +- label_radio.set_alignment(1, 0.5) +- label_radio.modify_fg(gtk.STATE_NORMAL, +- style.COLOR_SELECTION_GREY.get_gdk_color()) +- box_radio.pack_start(label_radio, expand=False) +- group.add_widget(label_radio) +- label_radio.show() +- self._button = gtk.CheckButton() +- self._button.set_alignment(0, 0) +- box_radio.pack_start(self._button, expand=False) +- self._button.show() +- box_wireless.pack_start(box_radio, expand=False) +- box_radio.show() +- +- self._radio_alert = InlineAlert() +- label_radio_error = gtk.Label() +- group.add_widget(label_radio_error) +- self._radio_alert_box.pack_start(label_radio_error, expand=False) +- label_radio_error.show() +- self._radio_alert_box.pack_start(self._radio_alert, expand=False) +- box_wireless.pack_end(self._radio_alert_box, expand=False) +- self._radio_alert_box.show() +- if 'radio' in self.restart_alerts: +- self._radio_alert.props.msg = self.restart_msg +- self._radio_alert.show() ++ #separator_wireless = gtk.HSeparator() ++ #self.pack_start(separator_wireless, expand=False) ++ #separator_wireless.show() ++ ++ #label_wireless = gtk.Label(_('Wireless')) ++ #label_wireless.set_alignment(0, 0) ++ #self.pack_start(label_wireless, expand=False) ++ #label_wireless.show() ++ #box_wireless = gtk.VBox() ++ #box_wireless.set_border_width(style.DEFAULT_SPACING * 2) ++ #box_wireless.set_spacing(style.DEFAULT_SPACING) ++ #box_radio = gtk.HBox(spacing=style.DEFAULT_SPACING) ++ #label_radio = gtk.Label(_('Radio:')) ++ #label_radio.set_alignment(1, 0.5) ++ #label_radio.modify_fg(gtk.STATE_NORMAL, ++ # style.COLOR_SELECTION_GREY.get_gdk_color()) ++ #box_radio.pack_start(label_radio, expand=False) ++ #group.add_widget(label_radio) ++ #label_radio.show() ++ #self._button = gtk.CheckButton() ++ #self._button.set_alignment(0, 0) ++ #box_radio.pack_start(self._button, expand=False) ++ #self._button.show() ++ #box_wireless.pack_start(box_radio, expand=False) ++ #box_radio.show() ++ ++ #self._radio_alert = InlineAlert() ++ #label_radio_error = gtk.Label() ++ #group.add_widget(label_radio_error) ++ #self._radio_alert_box.pack_start(label_radio_error, expand=False) ++ #label_radio_error.show() ++ #self._radio_alert_box.pack_start(self._radio_alert, expand=False) ++ #box_wireless.pack_end(self._radio_alert_box, expand=False) ++ #self._radio_alert_box.show() ++ #if 'radio' in self.restart_alerts: ++ # self._radio_alert.props.msg = self.restart_msg ++ # self._radio_alert.show() + +- self.pack_start(box_wireless, expand=False) +- box_wireless.show() ++ #self.pack_start(box_wireless, expand=False) ++ #box_wireless.show() + + separator_mesh = gtk.HSeparator() + self.pack_start(separator_mesh, False) + separator_mesh.show() + +- label_mesh = gtk.Label(_('Mesh')) ++ label_mesh = gtk.Label(_('Collaboration')) + label_mesh.set_alignment(0, 0) + self.pack_start(label_mesh, expand=False) + label_mesh.show() + box_mesh = gtk.VBox() + box_mesh.set_border_width(style.DEFAULT_SPACING * 2) + box_mesh.set_spacing(style.DEFAULT_SPACING) +- ++## More ubuntu fixes ++ server_info = gtk.Label(_("The server is the equivalent of what" ++ " room you are in; people on the same server" ++ " will be able to see each other, even when they" ++ " aren't on the same mesh.")) ++ server_info.set_alignment(0, 0) ++ server_info.set_line_wrap(True) ++ server_info.show() ++## End Ubuntu fixes + box_server = gtk.HBox(spacing=style.DEFAULT_SPACING) + label_server = gtk.Label(_('Server:')) + label_server.set_alignment(1, 0.5) +@@ -138,18 +151,18 @@ + + def setup(self): + self._entry.set_text(self._model.get_jabber()) +- try: +- radio_state = self._model.get_radio() +- except Exception, detail: +- self._radio_alert.props.msg = detail +- self._radio_alert.show() +- else: +- self._button.set_active(radio_state) ++ #try: ++ # radio_state = self._model.get_radio() ++ #except Exception, detail: ++ # self._radio_alert.props.msg = detail ++ # self._radio_alert.show() ++ #else: ++ # self._button.set_active(radio_state) + + self._jabber_valid = True +- self._radio_valid = True ++ #self._radio_valid = True + self.needs_restart = False +- self._radio_change_handler = self._button.connect( \ +- 'toggled', self.__radio_toggled_cb) ++ #self._radio_change_handler = self._button.connect( \ ++ # 'toggled', self.__radio_toggled_cb) + self._jabber_change_handler = self._entry.connect( \ + 'changed', self.__jabber_changed_cb)