diff -Nru indicator-remindor-14.01.1/data/ui/PreferencesDialog.ui indicator-remindor-14.06/data/ui/PreferencesDialog.ui --- indicator-remindor-14.01.1/data/ui/PreferencesDialog.ui 2014-01-13 15:35:00.000000000 +0000 +++ indicator-remindor-14.06/data/ui/PreferencesDialog.ui 2014-06-27 23:31:57.000000000 +0000 @@ -1424,7 +1424,7 @@ 5 - Boxcar Email + Boxcar Token True True True @@ -1442,7 +1442,7 @@ - + True True True diff -Nru indicator-remindor-14.01.1/debian/changelog indicator-remindor-14.06/debian/changelog --- indicator-remindor-14.01.1/debian/changelog 2014-05-26 11:54:58.000000000 +0000 +++ indicator-remindor-14.06/debian/changelog 2014-07-01 11:10:02.000000000 +0000 @@ -1,3 +1,9 @@ +indicator-remindor (14.06-0ubuntu1~saucy) saucy; urgency=low + + * Changed from Boxcar 1 to Boxcar 2 + + -- Brian Douglass Sat, 28 Jun 2014 21:12:00 -0500 + indicator-remindor (14.01.1-0ubuntu1~saucy) saucy; urgency=low * Changed to only use html help files diff -Nru indicator-remindor-14.01.1/indicator_remindor/indicator_remindorconfig.py indicator-remindor-14.06/indicator_remindor/indicator_remindorconfig.py --- indicator-remindor-14.01.1/indicator_remindor/indicator_remindorconfig.py 2014-05-26 11:53:50.000000000 +0000 +++ indicator-remindor-14.06/indicator_remindor/indicator_remindorconfig.py 2014-06-30 23:43:18.000000000 +0000 @@ -29,7 +29,7 @@ # files). By default, this is ../data, relative your trunk layout __indicator_remindor_data_directory__ = '/home/brian/dev/desktop/remindor/indicator-remindor/data/' __license__ = 'GPL-3' -__version__ = '14.01.1' +__version__ = '14.06' import os diff -Nru indicator-remindor-14.01.1/indicator_remindor/PreferencesDialog.py indicator-remindor-14.06/indicator_remindor/PreferencesDialog.py --- indicator-remindor-14.01.1/indicator_remindor/PreferencesDialog.py 2014-02-25 17:45:19.000000000 +0000 +++ indicator-remindor-14.06/indicator_remindor/PreferencesDialog.py 2014-06-29 00:56:35.000000000 +0000 @@ -84,7 +84,7 @@ self.hide_indicator_o = self.builder.get_object("hide_indicator_entry") self.indicator_icon_o = self.builder.get_object("indicator_icon_entry") - self.boxcar_o = self.builder.get_object("boxcar_email_entry") + self.boxcar_o = self.builder.get_object("boxcar_token_entry") self.boxcar_notification_o = self.builder.get_object("boxcar_notification_entry") self.pushbullet_api_key_o = self.builder.get_object('pushbullet_api_key_entry') self.pushbullet_device_o = self.builder.get_object('pushbullet_device_entry') @@ -112,8 +112,8 @@ widget.set_text("") def setup_services(self): - self.boxcar_o.set_text(self.settings.boxcar_email) - self.boxcar_original = self.settings.boxcar_email + self.boxcar_o.set_text(self.settings.boxcar_token) + self.boxcar_original = self.settings.boxcar_token self.boxcar_notification_o.set_active(self.settings.boxcar_notify) self.pushbullet_api_key_o.set_text(self.settings.pushbullet_api_key) @@ -264,10 +264,11 @@ self.destroy() def save_services(self): - return_status = True - boxcar_email = self.boxcar_o.get_text() - boxcar_notify = self.boxcar_notification_o.get_active() + #return_status = True + self.settings.boxcar_token = self.boxcar_o.get_text() + self.settings.boxcar_notify = self.boxcar_notification_o.get_active() + ''' status = self.info.validate_boxcar(boxcar_email, boxcar_notify, self.boxcar_original) if status == self.info.boxcar_add: self.settings.boxcar_email = boxcar_email @@ -291,14 +292,16 @@ dialog.destroy() return_status = False + ''' pushbullet = self.validate_pushbullet() if pushbullet: self.settings.pushbullet_device = self.info.get_pushbullet_id(self.pushbullet_device_o.get_active(), self.settings.pushbullet_devices) - return_status = (pushbullet and return_status) + #return_status = (pushbullet and return_status) - return return_status + #return return_status + return pushbullet def on_btn_help_clicked(self, widget, data=None): show_uri(self, get_help_uri('preferences')) diff -Nru indicator-remindor-14.01.1/po/indicator-remindor.pot indicator-remindor-14.06/po/indicator-remindor.pot --- indicator-remindor-14.01.1/po/indicator-remindor.pot 2014-05-26 11:52:10.000000000 +0000 +++ indicator-remindor-14.06/po/indicator-remindor.pot 2014-06-30 23:43:18.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-26 07:52-0400\n" +"POT-Creation-Date: 2014-06-30 19:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,41 +147,29 @@ "Would you like to continue?" msgstr "" -#: ../indicator_remindor/PreferencesDialog.py:279 -msgid "" -"It seems that you are not yet signed up for Boxcar.\n" -"Please visit boxcar.io to signup." -msgstr "" - -#: ../indicator_remindor/PreferencesDialog.py:287 -msgid "" -"There has been a error connecting with Boxcar,\n" -"please check your email address or network connection." -msgstr "" - -#: ../indicator_remindor/PreferencesDialog.py:342 +#: ../indicator_remindor/PreferencesDialog.py:345 msgid "Please provide a Pushbullet api key." msgstr "" -#: ../indicator_remindor/PreferencesDialog.py:365 +#: ../indicator_remindor/PreferencesDialog.py:368 msgid "" "The api key you provided is invalid.\n" "Please check your account on pushbullet.com." msgstr "" -#: ../indicator_remindor/PreferencesDialog.py:369 +#: ../indicator_remindor/PreferencesDialog.py:372 msgid "" "There was an error connecting with Pushbullet.\n" "Please check your api key or network connection." msgstr "" -#: ../indicator_remindor/PreferencesDialog.py:371 +#: ../indicator_remindor/PreferencesDialog.py:374 msgid "" "There was an error connecting with Pushbullet.\n" "Please try again later." msgstr "" -#: ../indicator_remindor/PreferencesDialog.py:393 +#: ../indicator_remindor/PreferencesDialog.py:396 #: ../data/ui/ReminderDialog.ui.h:28 ../data/ui/PreferencesDialog.ui.h:55 #: ../indicator_remindor/ReminderDialog.py:338 msgid "None" @@ -514,7 +502,7 @@ msgstr "" #: ../data/ui/PreferencesDialog.ui.h:50 -msgid "Boxcar Email" +msgid "Boxcar Token" msgstr "" #: ../data/ui/PreferencesDialog.ui.h:51 diff -Nru indicator-remindor-14.01.1/setup.py indicator-remindor-14.06/setup.py --- indicator-remindor-14.01.1/setup.py 2014-05-26 11:53:06.000000000 +0000 +++ indicator-remindor-14.06/setup.py 2014-06-27 23:32:41.000000000 +0000 @@ -66,7 +66,7 @@ DistUtilsExtra.auto.setup( name='indicator-remindor', - version='14.01.1', + version='14.06', license='GPL-3', author='Brian Douglass', author_email='bhdouglass@gmail.com',