Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 302929 | Differences between
and this patch

Collapse All | Expand All

(-)old/configure.ac (-3 / +4 lines)
Lines 161-169 AM_CONDITIONAL([HAVE_OPENSP],[test "x$en Link Here
161
161
162
AC_MSG_CHECKING([which extensions to build])
162
AC_MSG_CHECKING([which extensions to build])
163
163
164
ALL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures greasemonkey java-console livehttpheaders page-info permissions push-scroller rss sample sample-mozilla select-stylesheet sessionsaver sidebar smart-bookmarks tab-groups tab-states"
164
ALL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures gmail-manager greasemonkey java-console livehttpheaders page-info permissions push-scroller rss sample sample-mozilla select-stylesheet sessionsaver sidebar smart-bookmarks tab-groups tab-states"
165
USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks tab-groups tab-states"
165
USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures gmail-manager java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks tab-groups tab-states"
166
DEFAULT_EXTENSIONS="actions adblock auto-scroller certificates error-viewer extensions-manager-ui gestures java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks tab-groups tab-states"
166
DEFAULT_EXTENSIONS="actions adblock auto-scroller certificates error-viewer extensions-manager-ui gestures gmail-manager java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks tab-groups tab-states"
167
167
168
PYTHON_ALL_EXTENSIONS="python-console sample-python favicon cc-license-viewer epilicious"
168
PYTHON_ALL_EXTENSIONS="python-console sample-python favicon cc-license-viewer epilicious"
169
PYTHON_USEFUL_EXTENSIONS="python-console favicon cc-license-viewer"
169
PYTHON_USEFUL_EXTENSIONS="python-console favicon cc-license-viewer"
Lines 399-404 extensions/error-viewer/mozilla/Makefile Link Here
399
extensions/error-viewer/opensp/Makefile
399
extensions/error-viewer/opensp/Makefile
400
extensions/extensions-manager-ui/Makefile
400
extensions/extensions-manager-ui/Makefile
401
extensions/favicon/Makefile
401
extensions/favicon/Makefile
402
extensions/gmail-manager/Makefile
402
extensions/greasemonkey/Makefile
403
extensions/greasemonkey/Makefile
403
extensions/greasemonkey/mozilla/Makefile
404
extensions/greasemonkey/mozilla/Makefile
404
extensions/livehttpheaders/Makefile
405
extensions/livehttpheaders/Makefile
(-)old/extensions/gmail-manager/gmail.c (-22 / +24 lines)
Lines 379-410 gmail_account_load () Link Here
379
	char *path = g_strconcat (g_get_home_dir (), GMAIL_ACCOUNT_PATH, NULL);
379
	char *path = g_strconcat (g_get_home_dir (), GMAIL_ACCOUNT_PATH, NULL);
380
	FILE *file = fopen (path, "rw");
380
	FILE *file = fopen (path, "rw");
381
	g_free (path);
381
	g_free (path);
382
	if(file)
383
	{
384
		fseek (file, 0, SEEK_END);
385
		int size = ftell (file);
386
		rewind (file);
387
		char *buff = g_malloc (size * sizeof(char) + 1);
388
		fread (buff, 1, size, file);
389
		buff[size] = '\0';
390
		fclose (file);
382
391
383
	fseek (file, 0, SEEK_END);
392
		/* parsing file... */
384
	int size = ftell (file);
393
		char *ln = buff;
385
	rewind (file);
394
		char *next = NULL;
386
	char *buff = g_malloc (size * sizeof(char) + 1);
395
		while (ln[0] != '\0') {
387
	fread (buff, 1, size, file);
396
			next = strchr (((next == NULL) ? buff : (next + 1)), '\n');
388
	buff[size] = '\0';
397
			ln[next - ln] = '\0';
389
	fclose (file);
390
398
391
	/* parsing file... */
399
			char **split = g_strsplit (ln, " ", 3);
392
	char *ln = buff;
400
			accounts = g_list_append (accounts,
393
	char *next = NULL;
401
						  g_object_new (GMAIL_ACCOUNT_TYPE, 
394
	while (ln[0] != '\0') {
402
						  "mail", split[0],
395
		next = strchr (((next == NULL) ? buff : (next + 1)), '\n');
403
						  "password", split[1], NULL));
396
		ln[next - ln] = '\0';
404
			g_strfreev (split);
405
			ln = next + 1;
406
		}
397
407
398
		char **split = g_strsplit (ln, " ", 3);
408
		g_free (buff);
399
		accounts = g_list_append (accounts,
400
					  g_object_new (GMAIL_ACCOUNT_TYPE, 
401
					  "mail", split[0],
402
					  "password", split[1], NULL));
403
		g_strfreev (split);
404
		ln = next + 1;
405
	}
409
	}
406
407
	g_free (buff);
408
	return accounts;
410
	return accounts;
409
}
411
}
(-)old/extensions/gmail-manager/ephy-gmail-extension.c (-4 / +4 lines)
Lines 183-198 Link Here
183
183
184
static void
184
static void
185
impl_attach_tab (EphyExtension *ext,
185
impl_attach_tab (EphyExtension *ext,
186
		 EphyWindow *window,
186
		 EphyWindow *window,
187
		 EphyTab *tab)
187
		 EphyEmbed *tab)
188
{
188
{
189
	LOG ("attach_tab");
189
	LOG ("attach_tab");
190
}
190
}
191
191
192
static void
192
static void
193
impl_detach_tab (EphyExtension *ext,
193
impl_detach_tab (EphyExtension *ext,
194
		 EphyWindow *window,
194
		 EphyWindow *window,
195
		 EphyTab *tab)
195
		 EphyEmbed *tab)
196
{
196
{
197
	LOG("detach_tab");
197
	LOG("detach_tab");
198
}
198
}
(-)old/extensions/gmail-manager/Makefile.am (-2 / +1 lines)
Lines 18-25 libgmailextension_la_SOURCES = \ Link Here
18
	parser.c \
18
	parser.c \
19
	parser.h \
19
	parser.h \
20
	gmail-ui.h \
20
	gmail-ui.h \
21
	gmail-ui.c \
21
	gmail-ui.c
22
	test.c
23
22
24
libgmailextension_la_CPPFLAGS = \
23
libgmailextension_la_CPPFLAGS = \
25
        -I$(top_srcdir)/include				\
24
        -I$(top_srcdir)/include				\
(-)old/extensions/gmail-manager/gmail-status-icon.c (-13 / +15 lines)
Lines 618-625 gmail_status_icon_init_gui (GmailStatusI Link Here
618
					  TRUE);
618
					  TRUE);
619
619
620
	/* loading the icon... */
620
	/* loading the icon... */
621
	char *icon_path = g_strconcat (g_get_home_dir (), GMAIL_ICON_PATH, 
621
	char *icon_path = g_strconcat (GMAIL_ICON_PATH,NULL) ;
622
				       NULL);
623
	GtkWidget *icon = gtk_image_new_from_file (icon_path);
622
	GtkWidget *icon = gtk_image_new_from_file (icon_path);
624
	g_free (icon_path);
623
	g_free (icon_path);
625
624
Lines 644-650 gmail_status_icon_init_gui (GmailStatusI Link Here
644
			        self);
643
			        self);
645
	/* set timeouts */
644
	/* set timeouts */
646
	self->priv->timer_login = 
645
	self->priv->timer_login = 
647
		g_timeout_add (1000 * 120,
646
		g_timeout_add (1000 * 60,
648
			       (GSourceFunc) gmail_status_icon_handle_login,
647
			       (GSourceFunc) gmail_status_icon_handle_login,
649
			       self);
648
			       self);
650
}
649
}
Lines 678-685 gmail_status_icon_clicked_cb (GtkMenuIte Link Here
678
		char *pass;
677
		char *pass;
679
		g_object_get (acc, "password", &pass, NULL);
678
		g_object_get (acc, "password", &pass, NULL);
680
		char *tmp = g_strconcat ("https://www.google.com/accounts/ServiceLoginAuth?ltmpl=yj_wsad&ltmplcache=2&continue=https%3A%2F%2Fmail.google.com%2Fmail%3F&service=mail&rm=false&ltmpl=yj_wsad&Email=", user,"&Passwd=" ,pass, "&rmShown=1&null=Sign+in", NULL);
679
		char *tmp = g_strconcat ("https://www.google.com/accounts/ServiceLoginAuth?ltmpl=yj_wsad&ltmplcache=2&continue=https%3A%2F%2Fmail.google.com%2Fmail%3F&service=mail&rm=false&ltmpl=yj_wsad&Email=", user,"&Passwd=" ,pass, "&rmShown=1&null=Sign+in", NULL);
681
		EphyTab *tab = ephy_window_get_active_tab (EPHY_WINDOW (
680
		EphyEmbed *tab = NULL;
682
							self->priv->window));
681
							
683
		ephy_shell_new_tab (ephy_shell_get_default (),
682
		ephy_shell_new_tab (ephy_shell_get_default (),
684
				    EPHY_WINDOW (self->priv->window),
683
				    EPHY_WINDOW (self->priv->window),
685
			       	    tab, tmp,
684
			       	    tab, tmp,
Lines 832-838 gmail_status_icon_open_browser (GtkWidge Link Here
832
	 */
831
	 */
833
	char *url = (char*) g_hash_table_lookup (self->priv->popup_table, w);
832
	char *url = (char*) g_hash_table_lookup (self->priv->popup_table, w);
834
	EphyWindow *wnd = EPHY_WINDOW (self->priv->window);
833
	EphyWindow *wnd = EPHY_WINDOW (self->priv->window);
835
	EphyTab *tab = ephy_window_get_active_tab (wnd);
834
	EphyEmbed *tab = NULL;
836
	ephy_shell_new_tab (ephy_shell_get_default (), 
835
	ephy_shell_new_tab (ephy_shell_get_default (), 
837
			    wnd, tab, url,
836
			    wnd, tab, url,
838
			    EPHY_NEW_TAB_OPEN_PAGE |
837
			    EPHY_NEW_TAB_OPEN_PAGE |
Lines 885-896 gmail_status_icon_enter_cb (GtkWidget *w Link Here
885
{
884
{
886
	if (self->priv->popup_window) return;
885
	if (self->priv->popup_window) return;
887
	gmail_status_icon_create_popup (self);
886
	gmail_status_icon_create_popup (self);
888
	g_signal_connect_after (self->priv->popup_window, "leave-notify-event",
887
	if( self->priv->popup_window != NULL )
889
			        G_CALLBACK (gmail_status_icon_popup_leave_cb), 
888
	{
890
				self);
889
		g_signal_connect_after (self->priv->popup_window, "leave-notify-event",
891
	g_signal_connect_after (self->priv->popup_window, "enter-notify-event",
890
					G_CALLBACK (gmail_status_icon_popup_leave_cb), 
892
			        G_CALLBACK (gmail_status_icon_popup_enter_cb), 
891
					self);
893
				self);
892
		g_signal_connect_after (self->priv->popup_window, "enter-notify-event",
893
					G_CALLBACK (gmail_status_icon_popup_enter_cb), 
894
					self);
895
	}
894
}
896
}
895
897
896
void
898
void
Lines 1041-1047 gmail_status_icon_display_libnotify (Gma Link Here
1041
	}
1043
	}
1042
1044
1043
	n = notify_notification_new ("New Mail",
1045
	n = notify_notification_new ("New Mail",
1044
				     str, NULL, NULL);
1046
				     str, GMAILICON, NULL);
1045
	/* we'll show the message for about 5 seconds */
1047
	/* we'll show the message for about 5 seconds */
1046
	notify_notification_set_timeout (n, 5000); 
1048
	notify_notification_set_timeout (n, 5000); 
1047
	notify_notification_attach_to_widget (n, GTK_WIDGET (
1049
	notify_notification_attach_to_widget (n, GTK_WIDGET (
(-)old/extensions/gmail-manager/gmail-ui.c (-17 / +18 lines)
Lines 365-371 gmail_ui_changed_cb (GmailList *list, Gm Link Here
365
			        gmail_ui_changed_set_model, 
365
			        gmail_ui_changed_set_model, 
366
			        self);
366
			        self);
367
367
368
	g_free (active);
368
	if( active != NULL ) g_free (active);
369
	self->priv->active_tmp = NULL;
369
	self->priv->active_tmp = NULL;
370
}
370
}
371
371
Lines 396-402 gmail_ui_sync_box_insert_cb (GmailAccoun Link Here
396
	char *mail;
396
	char *mail;
397
	g_object_get (acc, "mail", &mail, NULL);
397
	g_object_get (acc, "mail", &mail, NULL);
398
	gtk_combo_box_append_text (box, mail);
398
	gtk_combo_box_append_text (box, mail);
399
	g_free (mail);
399
	if( mail != NULL ) g_free (mail);
400
}
400
}
401
401
402
/*
402
/*
Lines 455-470 gmail_ui_dlg_changed (GtkComboBox *box, Link Here
455
	if (self->priv->list == NULL) return;
455
	if (self->priv->list == NULL) return;
456
456
457
	char *mail = gtk_combo_box_get_active_text (box);
457
	char *mail = gtk_combo_box_get_active_text (box);
458
	g_return_if_fail (mail != NULL);
458
	if (mail != NULL)
459
	GmailAccount *acc = gmail_list_find_account (self->priv->list, mail);
459
	{
460
	g_return_if_fail (acc != NULL);
460
		GmailAccount *acc = gmail_list_find_account (self->priv->list, mail);
461
461
		g_return_if_fail (acc != NULL);
462
	char *val1, *val2;
462
463
	g_object_get (acc, "mail", &val1, "password", &val2, NULL);
463
		char *val1, *val2;
464
	gtk_entry_set_text (self->priv->mail_entry, val1);
464
		g_object_get (acc, "mail", &val1, "password", &val2, NULL);
465
	gtk_entry_set_text (self->priv->password_entry, val2);
465
		gtk_entry_set_text (self->priv->mail_entry, val1);
466
	g_free (val1);
466
		gtk_entry_set_text (self->priv->password_entry, val2);
467
	g_free (val2);
467
		if(val1 != NULL) g_free (val1);
468
		if(val2 != NULL) g_free (val2);
469
	}
468
}
470
}
469
471
470
void gmail_ui_dlg_add (GtkButton *ptr, gpointer user_data)
472
void gmail_ui_dlg_add (GtkButton *ptr, gpointer user_data)
Lines 472-481 void gmail_ui_dlg_add (GtkButton *ptr, g Link Here
472
	GmailUI *self = (GmailUI*) user_data;
472
	GmailUI *self = (GmailUI*) user_data;
473
	g_assert (self != NULL);
473
	g_assert (self != NULL);
474
474
475
	char *glade_path = g_strconcat (g_get_home_dir (), GMAIL_GLADE_FILE,
475
	char *glade_path = g_strconcat (GMAIL_GLADE_FILE,NULL);
476
				       NULL);
477
	GladeXML *xml = glade_xml_new (glade_path, NULL, NULL);
476
	GladeXML *xml = glade_xml_new (glade_path, NULL, NULL);
478
	g_free (glade_path);
477
	if (glade_path != NULL ) g_free (glade_path);
479
478
480
	GtkDialog *dlg = GTK_DIALOG (glade_xml_get_widget (xml, 
479
	GtkDialog *dlg = GTK_DIALOG (glade_xml_get_widget (xml, 
481
				     "gmail_new_dlg"));
480
				     "gmail_new_dlg"));
Lines 566-574 gmail_ui_get_type () Link Here
566
void
565
void
567
gmail_ui_init_gtk (GmailUI *ui)
566
gmail_ui_init_gtk (GmailUI *ui)
568
{
567
{
569
	char *path = g_strconcat (g_get_home_dir (), GMAIL_GLADE_FILE, NULL);
568
	char *path = g_strconcat (GMAIL_GLADE_FILE, NULL);
570
	GladeXML *xml = glade_xml_new (path, NULL, NULL);
569
	GladeXML *xml = glade_xml_new (path, NULL, NULL);
571
	g_free(path);
570
	if(path != NULL) g_free(path);
572
571
573
	GtkDialog *dlg = GTK_DIALOG (glade_xml_get_widget (xml,
572
	GtkDialog *dlg = GTK_DIALOG (glade_xml_get_widget (xml,
574
							   "gmail_edit_dlg"));
573
							   "gmail_edit_dlg"));

Return to bug 302929