Merge lp:~matias-wilkman/calendar-indicator/fix-typo-and-tautology into lp:calendar-indicator

[appas]

Bugfix for #1394124 and a UI typo

[Lorenzo Carbonell (lorenzo-carbonell)]

review: Approve

Unmerged revisions

46. By appas on 2015-07-12

fix typo and tautology

45. By appas on 2015-07-12

fix window size (bug #1394124)

=== modified file 'src/googlecalendarapi.py'
--- src/googlecalendarapi.py	2014-02-24 01:13:28 +0000
+++ src/googlecalendarapi.py	2015-07-12 10:12:30 +0000
@@ -562,7 +562,7 @@
 	#gc = GoogleCalendar(token_file = comun.TOKEN_FILE)
 	'''
 	print(gc.do_refresh_authorization())
-	if True and gc.access_token == None or gc.refresh_token == None:
+	if gc.access_token == None or gc.refresh_token == None:
 		authorize_url = gc.get_authorize_url()
 		print(authorize_url)
 		ld = LoginDialog(authorize_url)
 
=== modified file 'src/preferences_dialog.py'
--- src/preferences_dialog.py	2014-04-13 19:36:25 +0000
+++ src/preferences_dialog.py	2015-07-12 10:12:30 +0000
@@ -130,7 +130,7 @@
 		table3.set_row_spacings(5)
 		frame3.add(table3)
 		#
-		label21 = Gtk.Label(_('Time between autommatic syncronizations (hours)')+':')
+		label21 = Gtk.Label(_('Time between automatic syncronizations (hours)')+':')
 		label21.set_alignment(0,.5)
 		table3.attach(label21,0,1,0,1, xoptions = Gtk.AttachOptions.FILL, yoptions = Gtk.AttachOptions.SHRINK)
 		#