Attachment #26319 for bug #42880

View | Details | Raw Unified | Return to bug 42880
Collapse All | Expand All

Lines 393-398 Link Here

(-)gaim-0.74-orig/src/gtknotify.c (-1 / +13 lines)
393	gtk_widget_destroy(GTK_WIDGET(ui_handle));	393	gtk_widget_destroy(GTK_WIDGET(ui_handle));
394	}	394	}
395		395
		396	gboolean
		397	running_gnome(void)
		398	{
		399	if (g_getenv ("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path ("gnome-open") != NULL) {
		400	return TRUE;
		401	}
		402	return FALSE;
		403	}
		404
396	static void *	405	static void *
397	gaim_gtk_notify_uri(const char *uri)	406	gaim_gtk_notify_uri(const char *uri)
398	{	407	{
Lines 403-409 Link Here
403		412
404	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");	413	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
405		414
406	if (!strcmp(web_browser, "netscape")) {	415	/* if they are running gnome, use the gnome web browser */
		416	if (running_gnome() == TRUE) {
		417	command = g_strdup_printf("gnome-open \"%s\"", uri);
		418	} else if (!strcmp(web_browser, "netscape")) {
407	command = g_strdup_printf("netscape \"%s\"", uri);	419	command = g_strdup_printf("netscape \"%s\"", uri);
408	} else if (!strcmp(web_browser, "opera")) {	420	} else if (!strcmp(web_browser, "opera")) {
409	if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))	421	if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))

Lines 2268-2274 Link Here

(-)gaim-0.74-orig/src/gtkprefs.c (-1 / +4 lines)
2268	prefs_notebook_add_page(_("Proxy"), NULL, proxy_page(), &p, NULL, notebook_page++);	2268	prefs_notebook_add_page(_("Proxy"), NULL, proxy_page(), &p, NULL, notebook_page++);
2269	#ifndef _WIN32	2269	#ifndef _WIN32
2270	/* We use the registered default browser in windows */	2270	/* We use the registered default browser in windows */
2271	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);	2271	/* if the user is running gnome 2.x, hide the browsers tab */
		2272	if (running_gnome() == FALSE) {
		2273	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
		2274	}
2272	#endif	2275	#endif
2273	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);	2276	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
2274	prefs_notebook_add_page(_("Sounds"), NULL, sound_page(), &p, NULL, notebook_page++);	2277	prefs_notebook_add_page(_("Sounds"), NULL, sound_page(), &p, NULL, notebook_page++);

Return to bug 42880