applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if tmp is NULL before continuing Use terminal/exec for terminal

Browse source 
2002-01-04  Bradford Hovinen  <hovinen@ximian.com>

	* default-application-properties.c (edit_read): Check if tmp is
	NULL before continuing
	Use terminal/exec for terminal executable name key
This commit is contained in:
Bradford Hovinen 2002-01-04 18:40:41 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent a70178aebd
commit d3f81c7330
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/default-applications/ChangeLog
View file

@ -1,3 +1,9 @@
2002-01-04 Bradford Hovinen <hovinen@ximian.com>
* default-application-properties.c (edit_read): Check if tmp is
NULL before continuing
Use terminal/exec for terminal executable name key
2001-12-20 Bradford Hovinen <hovinen@ximian.com> 2001-12-20 Bradford Hovinen <hovinen@ximian.com>
* Makefile.am: Clean up * Makefile.am: Clean up

33
capplets/default-applications/default-application-properties.c
View file

@ -160,20 +160,23 @@ edit_read(void)
hcurrent_info.allows_urls = horiginal_info.allows_urls; hcurrent_info.allows_urls = horiginal_info.allows_urls;
hcurrent_info.index = horiginal_info.index; hcurrent_info.index = horiginal_info.index;
tmp = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/terminal", NULL); tmp = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/terminal/exec", NULL);
term_argv = g_strsplit (tmp, " ", 3);
toriginal_info.executable_name = term_argv[0];
toriginal_info.exec_app = term_argv[1];
toriginal_info.index = term_find_index (&toriginal_info); if (tmp != NULL) {
g_free (term_argv); term_argv = g_strsplit (tmp, " ", 3);
if (toriginal_info.index != -1) toriginal_info.executable_name = term_argv[0];
toriginal_info.name = possible_terminals[toriginal_info.index].name; toriginal_info.exec_app = term_argv[1];
tcurrent_info.name = toriginal_info.name; toriginal_info.index = term_find_index (&toriginal_info);
tcurrent_info.executable_name = g_strdup (toriginal_info.executable_name); g_strfreev (term_argv);
tcurrent_info.executable_name = g_strdup (toriginal_info.exec_app); if (toriginal_info.index != -1)
tcurrent_info.index = toriginal_info.index; toriginal_info.name = possible_terminals[toriginal_info.index].name;
tcurrent_info.name = toriginal_info.name;
tcurrent_info.executable_name = g_strdup (toriginal_info.executable_name);
tcurrent_info.executable_name = g_strdup (toriginal_info.exec_app);
tcurrent_info.index = toriginal_info.index;
}
/* Set sensitivity. */ /* Set sensitivity. */
@ -440,13 +443,13 @@ write_all (BrowserDescription *bd, EditorDescription *ed, HelpViewDescription *h
if (td->exec_app && td->executable_name) if (td->exec_app && td->executable_name)
{ {
tmp = g_strconcat (td->executable_name, " ", td->exec_app, NULL); tmp = g_strconcat (td->executable_name, " ", td->exec_app, NULL);
gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal", tmp, NULL); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal/exec", tmp, NULL);
g_free (tmp); g_free (tmp);
} }
else if (td->executable_name) else if (td->executable_name)
gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal", td->executable_name, NULL); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal/exec", td->executable_name, NULL);
else else
gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/terminal", NULL); gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/terminal/exec", NULL);
g_object_unref (G_OBJECT (client)); g_object_unref (G_OBJECT (client));
} }