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

Port to GConf.

Browse source 
2001-12-08  Richard Hestilow  <hestilow@ximian.com>

	* Port to GConf.
This commit is contained in:
Richard Hestilow 2001-12-08 06:37:51 +00:00 • committed by Rachel Hestilow
parent 8561c30299
commit 1978e49b89
5 changed files with 310 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/default-applications/ChangeLog
View file

@ -1,3 +1,7 @@
2001-12-08 Richard Hestilow <hestilow@ximian.com>
* Port to GConf.
2001-12-01 Richard Hestilow <hestilow@ximian.com> 2001-12-01 Richard Hestilow <hestilow@ximian.com>
* Initial GNOME2 port. * Initial GNOME2 port.

34
capplets/default-applications/callbacks.c
View file

@ -20,25 +20,26 @@ extern EditorDescription ecurrent_info;
extern HelpViewDescription hcurrent_info; extern HelpViewDescription hcurrent_info;
extern TerminalDescription tcurrent_info; extern TerminalDescription tcurrent_info;
extern void set_selected_terminal( gchar *string ); extern int set_selected_terminal( gchar *string );
extern void set_selected_help( gchar *string ); extern int set_selected_help( gchar *string );
extern void set_selected_editor( gchar *string ); extern int set_selected_editor( gchar *string );
extern void set_selected_browser( gchar *string ); extern int set_selected_browser( gchar *string );
void void
on_radiodefeditor_toggled (GtkToggleButton *togglebutton, on_radiodefeditor_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
gint a = GTK_TOGGLE_BUTTON (togglebutton)->active; gint a = GTK_TOGGLE_BUTTON (togglebutton)->active;
int index = -1;
/* Editor Custom */ /* Editor Custom */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table17"), !a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table17"), !a);
/* Editor Default */ /* Editor Default */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "editorselect"), a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "editorselect"), a);
if (a) if (a)
set_selected_editor (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_editor"))); index = set_selected_editor (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_editor")));
ecurrent_info.use_name = a; ecurrent_info.index = index;
edit_changed (togglebutton, user_data); edit_changed (togglebutton, user_data);
@ -98,15 +99,16 @@ on_seldefbrowser_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
gint a = GTK_TOGGLE_BUTTON (togglebutton)->active; gint a = GTK_TOGGLE_BUTTON (togglebutton)->active;
int index = -1;
/* Browser Custom */ /* Browser Custom */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table20"), !a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table20"), !a);
/* Browser Default */ /* Browser Default */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "browserselect"), a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "browserselect"), a);
if (a) if (a)
set_selected_browser (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_browser"))); index = set_selected_browser (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_browser")));
bcurrent_info.use_name = a; bcurrent_info.index = index;
edit_changed (togglebutton, user_data); edit_changed (togglebutton, user_data);
} }
@ -165,15 +167,17 @@ on_seldefview_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
gint a = GTK_TOGGLE_BUTTON (togglebutton)->active; gint a = GTK_TOGGLE_BUTTON (togglebutton)->active;
int index = -1;
/* Help Custom */ /* Help Custom */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table23"), !a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table23"), !a);
/* Help Default */ /* Help Default */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "helpselect"), a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "helpselect"), a);
g_print ("view toggled\n");
if (a) if (a)
set_selected_terminal (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_term"))); index =set_selected_help (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_help")));
hcurrent_info.use_name = a; hcurrent_info.index = index;
edit_changed (togglebutton, user_data); edit_changed (togglebutton, user_data);
} }
@ -183,7 +187,7 @@ void
on_combo_help_changed (GtkEditable *editable, on_combo_help_changed (GtkEditable *editable,
gpointer user_data) gpointer user_data)
{ {
set_selected_terminal (gtk_entry_get_text (editable)); set_selected_help (gtk_entry_get_text (editable));
edit_changed (editable, user_data); edit_changed (editable, user_data);
@ -231,15 +235,16 @@ on_seldefterm_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
gint a = GTK_TOGGLE_BUTTON (togglebutton)->active; gint a = GTK_TOGGLE_BUTTON (togglebutton)->active;
int index = -1;
/* Terminal Custom */ /* Terminal Custom */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table26"), !a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "table26"), !a);
/* Terminal Default */ /* Terminal Default */
gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "termselect"), a); gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "termselect"), a);
if (a) if (a)
set_selected_help (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_help"))); index = set_selected_terminal (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_term")));
tcurrent_info.use_name = a; tcurrent_info.index = index;
edit_changed (togglebutton, user_data); edit_changed (togglebutton, user_data);
@ -250,8 +255,7 @@ void
on_combo_term_changed (GtkEditable *editable, on_combo_term_changed (GtkEditable *editable,
gpointer user_data) gpointer user_data)
{ {
set_selected_terminal (gtk_entry_get_text (editable));
set_selected_help (gtk_entry_get_text (editable));
edit_changed (editable, user_data); edit_changed (editable, user_data);
} }

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

@ -3,7 +3,6 @@
* Based on capplets/gnome-edit-properties/gnome-edit-properties.c. * Based on capplets/gnome-edit-properties/gnome-edit-properties.c.
*/ */
#include <config.h> #include <config.h>
#include "capplet-widget.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -12,6 +11,9 @@
#include "gnome.h" #include "gnome.h"
#include "defaults.h" #include "defaults.h"
#include "interface.h" #include "interface.h"
#include <gconf/gconf-client.h>
#define GNOME_DESKTOP_PREFIX "/desktop/gnome/applications"
void fill_default_browser (void); void fill_default_browser (void);
void fill_default_terminal (void); void fill_default_terminal (void);
@ -23,20 +25,25 @@ static void fill_browser_data (BrowserDescription *info);
static void fill_help_data (HelpViewDescription *info); static void fill_help_data (HelpViewDescription *info);
static void fill_term_data (TerminalDescription *info); static void fill_term_data (TerminalDescription *info);
static void set_combo_terminal( gchar *string ); static int editor_find_index (EditorDescription *info);
static void set_combo_help( gchar *string ); static int browser_find_index (BrowserDescription *info);
static void set_combo_editor( gchar *string ); static int help_find_index (HelpViewDescription *info);
static void set_combo_browser( gchar *string ); static int term_find_index (TerminalDescription *info);
static void set_combo_terminal( int index );
static void set_combo_help( int index );
static void set_combo_editor( int index );
static void set_combo_browser( int index );
static void revert_all (void); static void revert_all (void);
static void write_all (BrowserDescription *bd, EditorDescription *ed, HelpViewDescription *hd, TerminalDescription *td); static void write_all (BrowserDescription *bd, EditorDescription *ed, HelpViewDescription *hd, TerminalDescription *td);
static void help_all (void); static void help_all (void);
static void apply_all (void); static void apply_all (void);
void set_selected_terminal( gchar *string ); int set_selected_terminal( gchar *string );
void set_selected_help( gchar *string ); int set_selected_help( gchar *string );
void set_selected_editor( gchar *string ); int set_selected_editor( gchar *string );
void set_selected_browser( gchar *string ); int set_selected_browser( gchar *string );
gboolean ignore_changes = TRUE; gboolean ignore_changes = TRUE;
@ -52,20 +59,20 @@ TerminalDescription tcurrent_info = { NULL };
EditorDescription possible_editors[] = EditorDescription possible_editors[] =
{ {
{ "gedit", "gedit", FALSE, "executable", FALSE }, { "gedit", "gedit", FALSE, FALSE },
{ "Emacs", "emacs", FALSE, "executable", TRUE }, { "Emacs", "emacs", FALSE, TRUE },
{ "XEmacs", "xemacs", FALSE, "executable", TRUE }, { "XEmacs", "xemacs", FALSE, TRUE },
{ "vi", "vi", TRUE, "executable", TRUE }, { "vi", "vi", TRUE, TRUE },
{ "Go", "go", FALSE, "executable", FALSE }, { "Go", "go", FALSE, FALSE },
{ "GWP", "gwp", FALSE, "executable", FALSE }, { "GWP", "gwp", FALSE, FALSE },
{ "Jed", "jed", TRUE, "executable", TRUE }, { "Jed", "jed", TRUE, TRUE },
{ "Joe", "joe", TRUE, "executable", TRUE }, { "Joe", "joe", TRUE, TRUE },
{ "Pico", "pico", TRUE, "executable", TRUE }, { "Pico", "pico", TRUE, TRUE },
{ "vim", "vim", TRUE, "executable", TRUE }, { "vim", "vim", TRUE, TRUE },
{ "gvim", "gvim", FALSE, "executable", TRUE }, { "gvim", "gvim", FALSE, TRUE },
{ "ed", "ed", TRUE, "executable", FALSE }, { "ed", "ed", TRUE, FALSE },
{ "GMC/CoolEdit", "gmc -e", FALSE, "mc-internal", FALSE }, { "GMC/CoolEdit", "gmc -e", FALSE, FALSE },
{ "Nedit", "nedit", FALSE, "executable", FALSE } { "Nedit", "nedit", FALSE, FALSE }
}; };
BrowserDescription possible_browsers[] = BrowserDescription possible_browsers[] =
@ -103,130 +110,70 @@ GtkWidget *checkbox;
static void static void
edit_read(void) edit_read(void)
{ {
gint term_argc; GConfClient *client;
gchar **term_argv; gchar **term_argv;
gchar *check1, *check2; gchar *tmp;
fill_default_help (); fill_default_help ();
fill_default_terminal (); fill_default_terminal ();
fill_default_browser (); fill_default_browser ();
fill_default_editor (); fill_default_editor ();
check1 = gnome_config_get_string("/editor/Editor/EDITNAME"); client = gconf_client_get_default ();
check2 = gnome_config_get_string("/editor/Editor/EDITOR");
if (check1 || !check2) {
eoriginal_info.use_name = TRUE;
ecurrent_info.use_name = TRUE;
} else {
eoriginal_info.use_name = FALSE;
ecurrent_info.use_name = FALSE;
}
g_free (check1);
g_free (check2);
eoriginal_info.name = gnome_config_get_string("/editor/Editor/EDITNAME");
eoriginal_info.executable_name = gnome_config_get_string("/editor/Editor/EDITOR");
eoriginal_info.needs_term = gnome_config_get_bool_with_default("/editor/Editor/NEEDS_TERM", NULL);
eoriginal_info.execution_type = gnome_config_get_string("/editor/Editor/EDITOR_TYPE");
eoriginal_info.accepts_lineno = gnome_config_get_bool_with_default("/editor/Editor/ACCEPTS_LINE_NO", NULL);
ecurrent_info.name = gnome_config_get_string("/editor/Editor/EDITNAME=gedit"); eoriginal_info.executable_name = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/editor/exec", NULL);
ecurrent_info.executable_name = gnome_config_get_string("/editor/Editor/EDITOR=gedit"); eoriginal_info.needs_term = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/editor/needs_term", NULL);
ecurrent_info.needs_term = gnome_config_get_bool_with_default("/editor/Editor/NEEDS_TERM=FALSE", NULL); eoriginal_info.accepts_lineno = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/editor/accepts_lineno", NULL);
ecurrent_info.execution_type = gnome_config_get_string("/editor/Editor/EDITOR_TYPE=executable"); eoriginal_info.index = editor_find_index (&eoriginal_info);
ecurrent_info.accepts_lineno = gnome_config_get_bool_with_default("/editor/Editor/ACCEPTS_LINE_NO=TRUE", NULL); if (eoriginal_info.index != -1)
eoriginal_info.name = possible_editors[eoriginal_info.index].name;
check1 = gnome_config_get_string("/gnome-moz-remote/Mozilla/BROWSER"); ecurrent_info.name = eoriginal_info.name;
check2 = gnome_config_get_string("/gnome-moz-remote/Mozilla/filename"); ecurrent_info.executable_name = g_strdup (eoriginal_info.executable_name);
if (check1 || !check2) { ecurrent_info.needs_term = eoriginal_info.needs_term;
boriginal_info.use_name = TRUE; ecurrent_info.accepts_lineno = eoriginal_info.accepts_lineno;
bcurrent_info.use_name = TRUE; ecurrent_info.index = eoriginal_info.index;
} else {
boriginal_info.use_name = FALSE;
bcurrent_info.use_name = FALSE;
}
g_free (check1);
g_free (check2);
if (gnome_is_program_in_path ("mozilla")) {
bcurrent_info.name = gnome_config_get_string("/gnome-moz-remote/Mozilla/BROWSER=Mozilla/Netscape 6");
bcurrent_info.executable_name = gnome_config_get_string("/gnome-moz-remote/Mozilla/filename=mozilla");
} else {
bcurrent_info.name = gnome_config_get_string("/gnome-moz-remote/Mozilla/BROWSER=Netscape Communicator");
bcurrent_info.executable_name = gnome_config_get_string("/gnome-moz-remote/Mozilla/filename=netscape");
}
bcurrent_info.needs_term = gnome_config_get_bool_with_default("/gnome-moz-remote/Mozilla/NEEDS_TERM=FALSE", NULL);
bcurrent_info.nremote = gnome_config_get_bool_with_default("/gnome-moz-remote/Mozilla/NREMOTE=TRUE", NULL);
boriginal_info.name = gnome_config_get_string("/gnome-moz-remote/Mozilla/BROWSER"); boriginal_info.executable_name = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/browser/exec", NULL);
boriginal_info.executable_name = gnome_config_get_string("/gnome-moz-remote/Mozilla/filename"); boriginal_info.needs_term = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/browser/needs_term", NULL);
boriginal_info.needs_term = gnome_config_get_bool_with_default("/gnome-moz-remote/Mozilla/NEEDS_TERM", NULL); boriginal_info.nremote = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/browser/nremote", NULL);
boriginal_info.nremote = gnome_config_get_bool_with_default("/gnome-moz-remote/Mozilla/NREMOTE", NULL); boriginal_info.index = browser_find_index (&boriginal_info);
if (boriginal_info.index != -1)
boriginal_info.name = possible_browsers[boriginal_info.index].name;
/* An smarter person would wonder why we are setting values in different places. It's because of the */ bcurrent_info.name = boriginal_info.name;
/* silly way url-properties works. Originally, I was going to replace that applet, but people seem to use it. */ bcurrent_info.executable_name = g_strdup (boriginal_info.executable_name);
/* For simplicity, at first, we will only support the ghelp calls. Not info or man. */ bcurrent_info.needs_term = boriginal_info.needs_term;
check1 = gnome_config_get_string("/Gnome/URL Handler Data/GHELP"); bcurrent_info.nremote = boriginal_info.nremote;
check2 = gnome_config_get_string("/Gnome/URL Handlers/ghelp-show"); bcurrent_info.index = boriginal_info.index;
if (check1 || !check2) {
horiginal_info.use_name = TRUE;
hcurrent_info.use_name = TRUE;
} else {
horiginal_info.use_name = FALSE;
hcurrent_info.use_name = FALSE;
}
g_free (check1);
g_free (check2);
if (gnome_is_program_in_path ("nautilus")) {
hcurrent_info.name = gnome_config_get_string("/Gnome/URL Handler Data/GHELP=nautilus");
hcurrent_info.executable_name = gnome_config_get_string ("/Gnome/URL Handlers/ghelp-show=nautilus");
} else {
hcurrent_info.name = gnome_config_get_string("/Gnome/URL Handler Data/GHELP=Gnome Help Browser");
hcurrent_info.executable_name = gnome_config_get_string ("/Gnome/URL Handlers/ghelp-show=gnome-help-browser");
}
hcurrent_info.needs_term = gnome_config_get_bool_with_default("/Gnome/URL Handler Data/GHELP_TERM=FALSE", NULL);
hcurrent_info.allows_urls = gnome_config_get_bool_with_default("/Gnome/URL Handler Data/GHELP_URLS=TRUE", NULL);
horiginal_info.name = gnome_config_get_string("/Gnome/URL Handler Data/GHELP"); horiginal_info.executable_name = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/help_viewer/exec", NULL);
horiginal_info.executable_name = gnome_config_get_string ("/Gnome/URL Handlers/ghelp-show"); horiginal_info.needs_term = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/help_viewer/needs_term", NULL);
horiginal_info.needs_term = gnome_config_get_bool_with_default("/Gnome/URL Handler Data/GHELP_TERM", NULL); horiginal_info.allows_urls = gconf_client_get_bool (client, GNOME_DESKTOP_PREFIX "/help_viewer/accepts_urls", NULL);
horiginal_info.allows_urls = gnome_config_get_bool_with_default("/Gnome/URL Handler Data/GHELP_URLS", NULL); horiginal_info.index = help_find_index (&horiginal_info);
if (horiginal_info.index != -1)
horiginal_info.name = possible_helpviewers[horiginal_info.index].name;
/* Ugh. This one is really complex. */ hcurrent_info.name = horiginal_info.name;
check1 = gnome_config_get_string("/Gnome/Applications/TERMNAME"); hcurrent_info.executable_name = g_strdup (horiginal_info.executable_name);
check2 = gnome_config_get_string("/Gnome/Applications/Terminal"); hcurrent_info.needs_term = horiginal_info.needs_term;
if (check1 || !check2) { hcurrent_info.allows_urls = horiginal_info.allows_urls;
toriginal_info.use_name = TRUE; hcurrent_info.index = horiginal_info.index;
tcurrent_info.use_name = TRUE;
} else {
toriginal_info.use_name = FALSE;
tcurrent_info.use_name = FALSE;
}
g_free (check1);
g_free (check2);
gnome_config_get_vector ("/Gnome/Applications/Terminal",
&term_argc, &term_argv);
if (term_argv == NULL) {
toriginal_info.executable_name = NULL;
toriginal_info.exec_app = NULL;
if (gnome_is_program_in_path ("gnome-terminal")) {
tcurrent_info.name = g_strdup ("Gnome Terminal");
tcurrent_info.executable_name = g_strdup ("gnome-terminal");
tcurrent_info.exec_app = g_strdup ("-x");
} else {
tcurrent_info.name = g_strdup ("Standard XTerminal");
tcurrent_info.executable_name = g_strdup ("xterm");
tcurrent_info.exec_app = g_strdup ("-e");
}
} else {
tcurrent_info.name = gnome_config_get_string("/Gnome/Applications/TERMNAME");
tcurrent_info.executable_name = term_argv[0];
tcurrent_info.exec_app = term_argv[1];
tmp = gconf_client_get_string (client, GNOME_DESKTOP_PREFIX "/terminal", NULL);
term_argv = g_strsplit (tmp, " ", 3);
toriginal_info.executable_name = term_argv[0]; toriginal_info.executable_name = term_argv[0];
toriginal_info.exec_app = term_argv[1]; toriginal_info.exec_app = term_argv[1];
}
toriginal_info.name = gnome_config_get_string("/Gnome/Applications/TERMNAME"); toriginal_info.index = term_find_index (&toriginal_info);
g_free (term_argv);
if (toriginal_info.index != -1)
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. */
@ -234,13 +181,15 @@ edit_read(void)
fill_browser_data (&bcurrent_info); fill_browser_data (&bcurrent_info);
fill_help_data (&hcurrent_info); fill_help_data (&hcurrent_info);
fill_term_data (&tcurrent_info); fill_term_data (&tcurrent_info);
g_object_unref (G_OBJECT (client));
} }
void void
edit_changed (GtkWidget *widget, gpointer data) edit_changed (GtkWidget *widget, gpointer data)
{ {
if (!ignore_changes) // if (!ignore_changes)
capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE); // capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE);
} }
static void static void
@ -280,8 +229,8 @@ fill_editor_data (EditorDescription *info)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "editorlineno")), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "editorlineno")),
info->accepts_lineno); info->accepts_lineno);
if (info->use_name) { if (info->index != -1) {
set_combo_editor (info->name); set_combo_editor (info->index);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(gtk_object_get_data (GTK_OBJECT (capplet), "radiodefeditor")), (gtk_object_get_data (GTK_OBJECT (capplet), "radiodefeditor")),
TRUE); TRUE);
@ -308,8 +257,8 @@ fill_browser_data (BrowserDescription *info)
info->nremote); info->nremote);
if (info->use_name) { if (info->index != -1) {
set_combo_browser (info->name); set_combo_browser (info->index);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(gtk_object_get_data (GTK_OBJECT (capplet), "seldefbrowser")), (gtk_object_get_data (GTK_OBJECT (capplet), "seldefbrowser")),
TRUE); TRUE);
@ -333,8 +282,8 @@ fill_help_data (HelpViewDescription *info)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "helpurls")), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "helpurls")),
info->allows_urls); info->allows_urls);
if (info->use_name) { if (info->index != -1) {
set_combo_help (info->name); set_combo_help (info->index);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(gtk_object_get_data (GTK_OBJECT (capplet), "seldefview")), (gtk_object_get_data (GTK_OBJECT (capplet), "seldefview")),
TRUE); TRUE);
@ -351,10 +300,10 @@ fill_term_data (TerminalDescription *info)
info->executable_name); info->executable_name);
gtk_entry_set_text (GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (capplet), "termexec")), gtk_entry_set_text (GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (capplet), "termexec")),
info->exec_app); (info->exec_app) ? info->exec_app : "");
if (info->use_name) { if (info->index != -1) {
set_combo_terminal (info->name); set_combo_terminal (info->index);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(gtk_object_get_data (GTK_OBJECT (capplet), "seldefterm")), (gtk_object_get_data (GTK_OBJECT (capplet), "seldefterm")),
TRUE); TRUE);
@ -365,6 +314,24 @@ fill_term_data (TerminalDescription *info)
} }
} }
static void
response_cb (GtkDialog *dialog, gint response_id, gpointer data)
{
switch (response_id)
{
case GTK_RESPONSE_NONE:
case GTK_RESPONSE_CLOSE:
gtk_main_quit ();
break;
case GTK_RESPONSE_APPLY:
apply_all ();
break;
case GTK_RESPONSE_HELP:
help_all ();
break;
}
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -372,14 +339,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, GNOMELOCALEDIR); bindtextdomain (PACKAGE, GNOMELOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE);
switch (gnome_capplet_init ("default-application-properties", VERSION, argc, gnome_program_init ("default-applications-properties", VERSION,
argv, NULL, 0, NULL)) { LIBGNOMEUI_MODULE, argc, argv, NULL);
case -1:
return 0;
default:
break;
}
ignore_changes = TRUE; ignore_changes = TRUE;
@ -390,17 +351,8 @@ main (int argc, char **argv)
edit_read (); edit_read ();
/* Connect the wrapper signals */ /* Connect the wrapper signals */
g_signal_connect (G_OBJECT (capplet), "response",
gtk_signal_connect (GTK_OBJECT (capplet), "help", response_cb, NULL);
GTK_SIGNAL_FUNC (help_all), NULL);
gtk_signal_connect (GTK_OBJECT (capplet), "try",
GTK_SIGNAL_FUNC (apply_all), NULL);
gtk_signal_connect (GTK_OBJECT (capplet), "revert",
GTK_SIGNAL_FUNC (revert_all), NULL);
gtk_signal_connect (GTK_OBJECT (capplet), "ok",
GTK_SIGNAL_FUNC (apply_all), NULL);
gtk_signal_connect (GTK_OBJECT (capplet), "cancel",
GTK_SIGNAL_FUNC (revert_all), NULL);
ignore_changes = FALSE; ignore_changes = FALSE;
@ -430,76 +382,73 @@ apply_all (void)
static void static void
help_all (void) help_all (void)
{ {
}
static gchar*
compose_full_term_exec (TerminalDescription *td, gchar *execstr)
{
g_return_val_if_fail (td != NULL, NULL);
g_return_val_if_fail (execstr != NULL, NULL);
if (td->exec_app)
return g_strconcat (td->executable_name, " ", td->exec_app, " ", execstr, " ", "\"%s\"", NULL);
else
return g_strconcat (td->executable_name, " ", execstr, " ", "\"%s\"", NULL);
} }
static void static void
write_all (BrowserDescription *bd, EditorDescription *ed, HelpViewDescription *hd, TerminalDescription *td) write_all (BrowserDescription *bd, EditorDescription *ed, HelpViewDescription *hd, TerminalDescription *td)
{ {
gchar *av_term[2]; gchar *tmp;
GConfClient *client = gconf_client_get_default ();
if (ed->use_name && ed->name) {
gnome_config_set_string ("/editor/Editor/EDITNAME", ed->name);
} else {
gnome_config_clean_key("/editor/Editor/EDITNAME");
}
if (bd->use_name && bd->name) {
gnome_config_set_string ("/gnome-moz-remote/Mozilla/BROWSER", bd->name);
} else {
gnome_config_clean_key("/gnome-moz-remote/Mozilla/BROWSER");
}
if (hd->use_name && hd->name) {
gnome_config_set_string ("/Gnome/URL Handler Data/GHELP", hd->name);
} else {
gnome_config_clean_key("/Gnome/URL Handler Data/GHELP");
}
if (td->use_name && td->name) {
gnome_config_set_string ("/Gnome/Applications/TERMNAME", td->name);
} else {
gnome_config_clean_key("/Gnome/Applications/TERMNAME");
}
if (ed->executable_name) if (ed->executable_name)
gnome_config_set_string("/editor/Editor/EDITOR", ed->executable_name); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/editor/exec", ed->executable_name, NULL);
else else
gnome_config_clean_key("/editor/Editor/EDITOR"); gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/editor/exec", NULL);
gnome_config_set_bool("/editor/Editor/NEEDS_TERM", ed->needs_term); gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/editor/needs_term", ed->needs_term, NULL);
if (ed->execution_type) gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/editor/accepts_lineno", ed->accepts_lineno, NULL);
gnome_config_set_string("/editor/Editor/EDITOR_TYPE", ed->execution_type);
else
gnome_config_clean_key("/editor/Editor/EDITOR_TYPE");
gnome_config_set_bool("/editor/Editor/ACCEPTS_LINE_NO", ed->accepts_lineno);
if (bd->executable_name) if (bd->executable_name)
gnome_config_set_string("/gnome-moz-remote/Mozilla/filename", bd->executable_name); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/browser/exec", bd->executable_name, NULL);
else else
gnome_config_clean_key("/gnome-moz-remote/Mozilla/filename"); gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/browser/exec", NULL);
gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/browser/needs_term", bd->needs_term, NULL);
gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/browser/nremote", bd->nremote, NULL);
if (bd->executable_name) { if (bd->needs_term)
gnome_config_set_bool("/gnome-moz-remote/Mozilla/NEEDS_TERM", bd->needs_term); tmp = compose_full_term_exec (td, bd->executable_name);
gnome_config_set_bool("/gnome-moz-remote/Mozilla/NREMOTE", bd->nremote); else
} else { tmp = g_strconcat (bd->executable_name, " \"%s\"", NULL);
gnome_config_clean_key ("/gnome-moz-remote/Mozilla/NEEDS_TERM"); gconf_client_set_string (client, "/desktop/gnome/url-handlers/default-show", tmp, NULL);
gnome_config_clean_key ("/gnome-moz-remote/Mozilla/NREMOTE"); g_free (tmp);
}
if (hd->executable_name) if (hd->executable_name)
gnome_config_set_string ("/Gnome/URL Handlers/ghelp-show", hd->executable_name); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/help_viewer/exec", hd->executable_name, NULL);
else else
gnome_config_clean_key("/Gnome/URL Handlers/ghelp-show"); gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/help_viewer/exec", NULL);
gnome_config_set_bool("/Gnome/URL Handler Data/GHELP_TERM", hd->needs_term); gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/help_viewer/needs_term", hd->needs_term, NULL);
gnome_config_set_bool("/Gnome/URL Handler Data/GHELP_URLS", hd->allows_urls); gconf_client_set_bool (client, GNOME_DESKTOP_PREFIX "/help_viewer/accepts_urls", hd->allows_urls, NULL);
if (hd->needs_term)
tmp = compose_full_term_exec (td, hd->executable_name);
else
tmp = g_strconcat (hd->executable_name, " \"%s\"", NULL);
gconf_client_set_string (client, "/desktop/gnome/url-handlers/ghelp-show", tmp, NULL);
g_free (tmp);
av_term[0] = td->executable_name;
av_term[1] = td->exec_app;
if (td->exec_app && td->executable_name) if (td->exec_app && td->executable_name)
gnome_config_set_vector ("/Gnome/Applications/Terminal", 2, av_term); {
tmp = g_strconcat (td->executable_name, " ", td->exec_app, NULL);
gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal", tmp, NULL);
g_free (tmp);
}
else if (td->executable_name) else if (td->executable_name)
gnome_config_set_string ("/Gnome/Applications/Terminal", td->executable_name); gconf_client_set_string (client, GNOME_DESKTOP_PREFIX "/terminal", td->executable_name, NULL);
else else
gnome_config_clean_key("/Gnome/Applications/Terminal"); gconf_client_unset (client, GNOME_DESKTOP_PREFIX "/terminal", NULL);
gnome_config_sync (); g_object_unref (G_OBJECT (client));
} }
void fill_default_browser () void fill_default_browser ()
@ -574,97 +523,47 @@ void fill_default_editor ()
static void static void
set_combo_browser( gchar *string ) set_combo_browser(int index)
{ {
gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "browserselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "browserselect");
if (!string) gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(combo)->entry),
return; possible_browsers[ index ].name );
for ( i = 0; i < sizeof(possible_browsers) / sizeof(possible_browsers[0]); i++ ) {
if ( ! strcmp( possible_browsers[ i ].executable_name, string ) ) {
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo)->entry),
possible_browsers[ i ].name );
return;
}
}
gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );
} }
static void static void
set_combo_editor( gchar *string ) set_combo_editor(int index)
{ {
gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "editorselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "editorselect");
if (!string) gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(combo)->entry),
return; possible_editors[ index ].name );
for ( i = 0; i < sizeof(possible_editors) / sizeof(possible_editors[0]); i++ ) {
if ( ! strcmp( possible_editors[ i ].executable_name, string ) ) {
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo)->entry),
possible_editors[ i ].name );
return;
}
}
gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );
} }
static void static void
set_combo_help( gchar *string ) set_combo_help(int index)
{ {
gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "helpselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "helpselect");
gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(combo)->entry),
if (!string) possible_helpviewers[ index ].name );
return;
for ( i = 0;
i < sizeof(possible_helpviewers) / sizeof(possible_helpviewers[0]);
i++ ) {
if ( ! strcmp( possible_helpviewers[ i ].executable_name, string ) )
{
gtk_entry_set_text
( GTK_ENTRY(GTK_COMBO(combo)->entry),
possible_helpviewers[ i ].name );
return;
}
}
gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );
} }
static void static void
set_combo_terminal( gchar *string ) set_combo_terminal(int index)
{ {
gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "termselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "termselect");
gtk_entry_set_text (GTK_ENTRY(GTK_COMBO(combo)->entry),
if (!string) possible_terminals[ index ].name );
return;
for ( i = 0;
i < sizeof(possible_terminals) / sizeof(possible_terminals[0]);
i++ ) {
if ( ! strcmp( possible_terminals[ i ].executable_name, string ) )
{
gtk_entry_set_text
( GTK_ENTRY(GTK_COMBO(combo)->entry),
possible_terminals[ i ].name );
return;
}
}
gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );
} }
void int
set_selected_browser( gchar *string ) set_selected_browser( gchar *string )
{ {
gint i; gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "browserselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "browserselect");
if (!string) if (!string)
return; return -1;
for ( i = 0; i < sizeof(possible_browsers) / sizeof(possible_browsers[0]); i++ ) { for ( i = 0; i < sizeof(possible_browsers) / sizeof(possible_browsers[0]); i++ ) {
if ( ! strcmp( possible_browsers[ i ].name, string ) ) { if ( ! strcmp( possible_browsers[ i ].name, string ) ) {
@ -674,20 +573,21 @@ set_selected_browser( gchar *string )
possible_browsers[ i ].needs_term); possible_browsers[ i ].needs_term);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "browserremote")), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "browserremote")),
possible_browsers[ i ].nremote); possible_browsers[ i ].nremote);
return; return i;
} }
} }
/* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/ /* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/
return -1;
} }
void int
set_selected_editor( gchar *string ) set_selected_editor( gchar *string )
{ {
gint i; gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "editorselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "editorselect");
if (!string) if (!string)
return; return -1;
for ( i = 0; i < sizeof(possible_editors) / sizeof(possible_editors[0]); i++ ) { for ( i = 0; i < sizeof(possible_editors) / sizeof(possible_editors[0]); i++ ) {
if ( ! strcmp( possible_editors[ i ].name, string ) ) { if ( ! strcmp( possible_editors[ i ].name, string ) ) {
@ -697,20 +597,21 @@ set_selected_editor( gchar *string )
possible_editors[ i ].needs_term); possible_editors[ i ].needs_term);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "editorlineno")), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "editorlineno")),
possible_editors[ i ].accepts_lineno); possible_editors[ i ].accepts_lineno);
return; return i;
} }
} }
/* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string ); */ /* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string ); */
return -1;
} }
void int
set_selected_help( gchar *string ) set_selected_help( gchar *string )
{ {
gint i; gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "helpselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "helpselect");
if (!string) if (!string)
return; return -1;
for ( i = 0; for ( i = 0;
i < sizeof(possible_helpviewers) / sizeof(possible_helpviewers[0]); i < sizeof(possible_helpviewers) / sizeof(possible_helpviewers[0]);
@ -723,20 +624,21 @@ set_selected_help( gchar *string )
possible_helpviewers[ i ].needs_term); possible_helpviewers[ i ].needs_term);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "helpurls")), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (capplet), "helpurls")),
possible_helpviewers[ i ].allows_urls); possible_helpviewers[ i ].allows_urls);
return; return i;
} }
} }
/* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/ /* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/
return -1;
} }
void int
set_selected_terminal( gchar *string ) set_selected_terminal( gchar *string )
{ {
gint i; gint i;
GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "termselect"); GtkWidget *combo = gtk_object_get_data (GTK_OBJECT (capplet), "termselect");
if (!string) if (!string)
return; return -1;
for ( i = 0; for ( i = 0;
i < sizeof(possible_terminals) / sizeof(possible_terminals[0]); i < sizeof(possible_terminals) / sizeof(possible_terminals[0]);
@ -747,10 +649,82 @@ set_selected_terminal( gchar *string )
possible_terminals[ i ].executable_name); possible_terminals[ i ].executable_name);
gtk_entry_set_text (GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (capplet), "termexec")), gtk_entry_set_text (GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (capplet), "termexec")),
possible_terminals[ i ].exec_app); possible_terminals[ i ].exec_app);
return; return i;
} }
} }
/* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/ /* gtk_entry_set_text( GTK_ENTRY(GTK_COMBO(combo)->entry), string );*/
return -1;
} }
static int editor_find_index (EditorDescription *info)
{
int i;
g_return_val_if_fail (info != NULL, -1);
for ( i = 0;
i < sizeof(possible_editors) / sizeof(possible_editors[0]);
i++ ) {
if (!strcmp (possible_editors[i].executable_name, info->executable_name) &&
possible_editors[i].needs_term == info->needs_term &&
possible_editors[i].accepts_lineno == info->accepts_lineno)
return i;
}
return -1;
}
static int browser_find_index (BrowserDescription *info)
{
int i;
g_return_val_if_fail (info != NULL, -1);
for ( i = 0;
i < sizeof(possible_browsers) / sizeof(possible_browsers[0]);
i++ ) {
if (!strcmp (possible_browsers[i].executable_name, info->executable_name) &&
possible_browsers[i].needs_term == info->needs_term &&
possible_browsers[i].nremote == info->nremote)
return i;
}
return -1;
}
static int help_find_index (HelpViewDescription *info)
{
int i;
g_return_val_if_fail (info != NULL, -1);
for ( i = 0;
i < sizeof(possible_helpviewers) / sizeof(possible_helpviewers[0]);
i++ ) {
if (!strcmp (possible_helpviewers[i].executable_name, info->executable_name) &&
possible_helpviewers[i].needs_term == info->needs_term &&
possible_helpviewers[i].allows_urls == info->allows_urls)
return i;
}
return -1;
}
static int term_find_index (TerminalDescription *info)
{
int i;
g_return_val_if_fail (info != NULL, -1);
for ( i = 0;
i < sizeof(possible_terminals) / sizeof(possible_terminals[0]);
i++ ) {
if (!strcmp (possible_terminals[i].executable_name, info->executable_name) &&
!strcmp (possible_terminals[i].exec_app, info->exec_app))
return i;
}
return -1;
}

9
capplets/default-applications/defaults.h
View file

@ -10,9 +10,8 @@ struct _EditorDescription
gchar *name; gchar *name;
gchar *executable_name; gchar *executable_name;
gboolean needs_term; gboolean needs_term;
gchar *execution_type;
gboolean accepts_lineno; gboolean accepts_lineno;
gboolean use_name; int index;
}; };
struct _BrowserDescription struct _BrowserDescription
@ -21,7 +20,7 @@ struct _BrowserDescription
gchar *executable_name; gchar *executable_name;
gboolean needs_term; gboolean needs_term;
gboolean nremote; gboolean nremote;
gboolean use_name; int index;
}; };
struct _HelpViewDescription struct _HelpViewDescription
@ -30,7 +29,7 @@ struct _HelpViewDescription
gchar *executable_name; gchar *executable_name;
gboolean needs_term; gboolean needs_term;
gboolean allows_urls; gboolean allows_urls;
gboolean use_name; int index;
}; };
struct _TerminalDesciption struct _TerminalDesciption
@ -38,6 +37,6 @@ struct _TerminalDesciption
gchar *name; gchar *name;
gchar *executable_name; gchar *executable_name;
gchar *exec_app; gchar *exec_app;
gboolean use_name; int index;
}; };

10
capplets/default-applications/interface.c
View file

@ -95,7 +95,12 @@ edit_create (void)
tooltips = gtk_tooltips_new (); tooltips = gtk_tooltips_new ();
capplet = capplet_widget_new(); capplet = gtk_dialog_new_with_buttons (_("Default Applications"), NULL,
-1,
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
ignore_changes = TRUE; ignore_changes = TRUE;
notebook1 = gtk_notebook_new (); notebook1 = gtk_notebook_new ();
@ -103,7 +108,8 @@ edit_create (void)
gtk_object_set_data_full (GTK_OBJECT (capplet), "notebook1", notebook1, gtk_object_set_data_full (GTK_OBJECT (capplet), "notebook1", notebook1,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (notebook1); gtk_widget_show (notebook1);
gtk_container_add (GTK_CONTAINER (capplet), notebook1); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (capplet)->vbox), notebook1,
TRUE, TRUE, 0);
frame1 = gtk_frame_new (_("Gnome Default Editor")); frame1 = gtk_frame_new (_("Gnome Default Editor"));
gtk_widget_ref (frame1); gtk_widget_ref (frame1);