/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Mar 27 16:45:12 2011 UTC (3 years, 3 months ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Revision bump using URL handlers for browser and mailer applications to be compatible with glib-2.28, not showing twice the configured background if it is a symlink to a known background, not erasing backgrounds.xml under some circumstances (bug #344335 by Matthew Turnbull). Remove old.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

1 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c
2 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:30:55.000000000 +0200
3 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:31:26.000000000 +0200
4 @@ -64,83 +64,26 @@
5 }
6
7 static void
8 -web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet)
9 -{
10 - gint index;
11 - GnomeDAWebItem *item;
12 - const gchar *command;
13 - GError *error = NULL;
14 -
15 - index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box));
16 -
17 - if (index == -1)
18 - return;
19 -
20 - item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index);
21 - if (item == NULL)
22 - return;
23 -
24 - if (togglebutton == capplet->new_win_radiobutton) {
25 - command = item->win_command;
26 - }
27 - else if (togglebutton == capplet->new_tab_radiobutton) {
28 - command = item->tab_command;
29 - }
30 - else {
31 - command = item->generic.command;
32 - }
33 -
34 - gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
35 -
36 - gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
37 -
38 - if (error != NULL) {
39 - g_warning (_("Error saving configuration: %s"), error->message);
40 - g_error_free (error);
41 - }
42 -}
43 -
44 -static void
45 web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
46 {
47 guint current_index;
48 - gboolean is_custom_active;
49 - gboolean has_net_remote;
50 - GnomeDAWebItem *item;
51 - GtkWidget *active = NULL;
52
53 current_index = gtk_combo_box_get_active (combo);
54
55 if (current_index < g_list_length (capplet->web_browsers)) {
56 + GnomeDAURLItem *item;
57 + GError *error = NULL;
58
59 - item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index);
60 - has_net_remote = item->netscape_remote;
61 - is_custom_active = FALSE;
62 -
63 - }
64 - else {
65 - has_net_remote = FALSE;
66 - is_custom_active = TRUE;
67 - }
68 - gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
69 - gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
70 - gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
71 -
72 - gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
73 - gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
74 - gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
75 -
76 - if (has_net_remote) {
77 -
78 - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)))
79 - active = capplet->new_win_radiobutton;
80 - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)))
81 - active = capplet->new_tab_radiobutton;
82 - else
83 - active = capplet->default_radiobutton;
84 + item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index);
85 + if (item == NULL)
86 + return;
87 +
88 + if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error) ||
89 + !g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/https", &error)) {
90 + g_warning (_("Error setting default browser: %s"), error->message);
91 + g_error_free (error);
92 + }
93 }
94 -
95 - web_radiobutton_toggled_cb (active, capplet);
96 }
97
98 /* FIXME: Refactor these two functions below into one... */
99 @@ -148,14 +91,23 @@
100 mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
101 {
102 guint current_index;
103 - gboolean is_custom_active;
104
105 current_index = gtk_combo_box_get_active (combo);
106 - is_custom_active = (current_index >= g_list_length (capplet->mail_readers));
107
108 - gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active);
109 - gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active);
110 - gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active);
111 + if (current_index < g_list_length (capplet->mail_readers)) {
112 + GnomeDAURLItem *item;
113 + GError *error = NULL;
114 +
115 + item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index);
116 + if (item == NULL)
117 + return;
118 +
119 + if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/mailto", &error)) {
120 + g_warning (_("Error setting default mailer: %s"), error->message);
121 + g_error_free (error);
122 + }
123 + }
124 +
125 }
126
127 static void
128 @@ -297,221 +249,6 @@
129 return (strcmp (((GnomeDAItem *) list_item)->command, (gchar *) command));
130 }
131
132 -static gint
133 -web_item_comp (gconstpointer item, gconstpointer command)
134 -{
135 - GnomeDAWebItem *web_list_item;
136 -
137 - web_list_item = (GnomeDAWebItem *) item;
138 -
139 - if (strcmp (web_list_item->generic.command, (gchar *) command) == 0)
140 - return 0;
141 -
142 - if (web_list_item->netscape_remote) {
143 - if (strcmp (web_list_item->tab_command, (gchar *) command) == 0)
144 - return 0;
145 -
146 - if (strcmp (web_list_item->win_command, (gchar *) command) == 0)
147 - return 0;
148 - }
149 -
150 - return (strcmp (web_list_item->generic.command, (gchar *) command));
151 -}
152 -
153 -static void
154 -web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet)
155 -{
156 - GConfChangeSet *cs;
157 - GError *error = NULL;
158 - GList *list_entry;
159 -
160 - /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which
161 - * should also use the same value as HTTP
162 - */
163 -
164 - if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
165 - gchar *short_browser, *pos;
166 - const gchar *value_str = gconf_value_get_string (value);
167 -
168 - cs = gconf_change_set_new ();
169 -
170 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
171 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value);
172 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value);
173 - pos = strstr (value_str, " ");
174 - if (pos == NULL)
175 - short_browser = g_strdup (value_str);
176 - else
177 - short_browser = g_strndup (value_str, pos - value_str);
178 - gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser);
179 - g_free (short_browser);
180 -
181 - list_entry = g_list_find_custom (capplet->web_browsers,
182 - value_str,
183 - (GCompareFunc) web_item_comp);
184 -
185 - if (list_entry) {
186 - GnomeDAWebItem *item = (GnomeDAWebItem *) list_entry->data;
187 -
188 - gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote);
189 - }
190 -
191 - gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
192 -
193 - if (error != NULL) {
194 - g_warning (_("Error saving configuration: %s"), error->message);
195 - g_error_free (error);
196 - error = NULL;
197 - }
198 -
199 - gconf_change_set_unref (cs);
200 - }
201 - else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) {
202 - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
203 - gconf_value_get_bool (value));
204 -
205 - cs = gconf_change_set_new ();
206 -
207 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value);
208 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value);
209 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value);
210 - gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value);
211 -
212 - gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
213 -
214 - if (error != NULL) {
215 - g_warning (_("Error saving configuration: %s"), error->message);
216 - g_error_free (error);
217 - error = NULL;
218 - }
219 -
220 - gconf_change_set_unref (cs);
221 - }
222 -}
223 -
224 -static void
225 -web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command)
226 -{
227 - GList *entry;
228 - gboolean has_net_remote;
229 -
230 - entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp);
231 -
232 - if (entry) {
233 - GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data;
234 -
235 - has_net_remote = item->netscape_remote;
236 -
237 - if (has_net_remote) {
238 - /* disable "toggle" signal emitting, thus preventing calling this function twice */
239 - g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
240 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
241 - g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
242 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
243 - g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0,
244 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
245 -
246 - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton),
247 - strcmp (item->generic.command, command) == 0);
248 - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton),
249 - strcmp (item->tab_command, command) == 0);
250 - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton),
251 - strcmp (item->win_command, command) == 0);
252 -
253 - g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
254 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
255 - g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
256 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
257 - g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
258 - 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
259 - }
260 - }
261 - else {
262 - has_net_remote = FALSE;
263 - }
264 -
265 - gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
266 - gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
267 - gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
268 -}
269 -
270 -static GConfValue*
271 -web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
272 -{
273 - GConfValue *ret;
274 - GList *entry, *handlers;
275 - const gchar *command;
276 - gint index;
277 - GnomeDACapplet *capplet;
278 -
279 - g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
280 -
281 - command = gconf_value_get_string (value);
282 - handlers = capplet->web_browsers;
283 -
284 - if (handlers)
285 - {
286 - entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp);
287 - if (entry)
288 - index = g_list_position (handlers, entry);
289 - else
290 - index = g_list_length (handlers) + 1;
291 - }
292 - else
293 - {
294 - /* if the item has no handlers lsit then select the Custom item */
295 - index = 1;
296 - }
297 -
298 - web_browser_update_radio_buttons (capplet, command);
299 -
300 - ret = gconf_value_new (GCONF_VALUE_INT);
301 - gconf_value_set_int (ret, index);
302 -
303 - return ret;
304 -}
305 -
306 -static GConfValue*
307 -web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
308 -{
309 - GConfValue *ret;
310 - GList *handlers;
311 - gint index;
312 - GnomeDAWebItem *item;
313 - const gchar *command;
314 - GnomeDACapplet *capplet;
315 -
316 - g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
317 -
318 - index = gconf_value_get_int (value);
319 - handlers = capplet->web_browsers;
320 -
321 - item = g_list_nth_data (handlers, index);
322 -
323 - ret = gconf_value_new (GCONF_VALUE_STRING);
324 - if (!item)
325 - {
326 - /* if item was not found, this is probably the "Custom" item */
327 - /* XXX: returning "" as the value here is not ideal, but required to
328 - * prevent the combo box from jumping back to the previous value if the
329 - * user has selected Custom */
330 - gconf_value_set_string (ret, "");
331 - return ret;
332 - }
333 - else
334 - {
335 - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE)
336 - command = item->win_command;
337 - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE)
338 - command = item->tab_command;
339 - else
340 - command = item->generic.command;
341 -
342 - gconf_value_set_string (ret, command);
343 - return ret;
344 - }
345 -}
346 -
347 static GConfValue*
348 combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
349 {
350 @@ -632,7 +369,7 @@
351 }
352
353 static void
354 -fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
355 +fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom)
356 {
357 GList *entry;
358 GtkTreeModel *model;
359 @@ -644,8 +381,10 @@
360 theme = gtk_icon_theme_get_default ();
361 }
362
363 - gtk_combo_box_set_row_separator_func (combo_box, is_separator,
364 - GINT_TO_POINTER (g_list_length (app_list)), NULL);
365 + if (add_custom) {
366 + gtk_combo_box_set_row_separator_func (combo_box, is_separator,
367 + GINT_TO_POINTER (g_list_length (app_list)), NULL);
368 + }
369
370 model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING));
371 gtk_combo_box_set_model (combo_box, model);
372 @@ -683,13 +422,41 @@
373 g_object_unref (pixbuf);
374 }
375
376 - gtk_list_store_append (GTK_LIST_STORE (model), &iter);
377 - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1);
378 - gtk_list_store_append (GTK_LIST_STORE (model), &iter);
379 - gtk_list_store_set (GTK_LIST_STORE (model), &iter,
380 - PIXBUF_COL, NULL,
381 - TEXT_COL, _("Custom"),
382 - -1);
383 + if (add_custom) {
384 + gtk_list_store_append (GTK_LIST_STORE (model), &iter);
385 + gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1);
386 + gtk_list_store_append (GTK_LIST_STORE (model), &iter);
387 + gtk_list_store_set (GTK_LIST_STORE (model), &iter,
388 + PIXBUF_COL, NULL,
389 + TEXT_COL, _("Custom"),
390 + -1);
391 + }
392 +}
393 +
394 +static void
395 +select_current_for_uri_scheme (GtkComboBox *combo_box, GList *app_list, const gchar *uri)
396 +{
397 + GAppInfo *current_default;
398 + GList *l;
399 + int index;
400 +
401 + current_default = g_app_info_get_default_for_uri_scheme (uri);
402 + if (!current_default)
403 + return;
404 +
405 + index = 0;
406 +
407 + for (l = app_list; l != NULL; l = l->next) {
408 + if (!g_app_info_equal (current_default, ((GnomeDAURLItem *) l->data)->app_info)) {
409 + index++;
410 + continue;
411 + }
412 +
413 + gtk_combo_box_set_active (combo_box, index);
414 + break;
415 + }
416 +
417 + g_object_unref (current_default);
418 }
419
420 static GtkWidget*
421 @@ -702,7 +469,6 @@
422 static void
423 show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
424 {
425 - GObject *obj;
426 GtkBuilder *builder;
427 guint builder_result;
428
429 @@ -732,17 +498,6 @@
430 capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog");
431 g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL);
432
433 - capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry");
434 - capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label");
435 - capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton");
436 - capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton");
437 - capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton");
438 - capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton");
439 -
440 - capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry");
441 - capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label");
442 - capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton");
443 -
444 capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry");
445 capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label");
446 capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry");
447 @@ -770,12 +525,15 @@
448 g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
449 screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
450
451 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
452 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
453 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
454 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players);
455 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
456 - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
457 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE);
458 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE);
459 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE);
460 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE);
461 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE);
462 + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE);
463 +
464 + select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http");
465 + select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto");
466
467 g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
468 g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet);
469 @@ -784,53 +542,8 @@
470 g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet);
471 g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet);
472
473 -
474 - g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
475 - g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
476 - g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
477 -
478 /* Setup GConfPropertyEditors */
479
480 - /* Web Browser */
481 - gconf_peditor_new_combo_box (NULL,
482 - DEFAULT_APPS_KEY_HTTP_EXEC,
483 - capplet->web_combo_box,
484 - "conv-from-widget-cb", web_combo_conv_from_widget,
485 - "conv-to-widget-cb", web_combo_conv_to_widget,
486 - "data", capplet,
487 - NULL);
488 -
489 - obj = gconf_peditor_new_string (NULL,
490 - DEFAULT_APPS_KEY_HTTP_EXEC,
491 - capplet->web_browser_command_entry,
492 - NULL);
493 - g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet);
494 -
495 - obj = gconf_peditor_new_boolean (NULL,
496 - DEFAULT_APPS_KEY_HTTP_NEEDS_TERM,
497 - capplet->web_browser_terminal_checkbutton,
498 - NULL);
499 - g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet);
500 -
501 - /* Mailer */
502 - gconf_peditor_new_combo_box (NULL,
503 - DEFAULT_APPS_KEY_MAILER_EXEC,
504 - capplet->mail_combo_box,
505 - "conv-from-widget-cb", combo_conv_from_widget,
506 - "conv-to-widget-cb", combo_conv_to_widget,
507 - "data", capplet->mail_readers,
508 - NULL);
509 -
510 - gconf_peditor_new_string (NULL,
511 - DEFAULT_APPS_KEY_MAILER_EXEC,
512 - capplet->mail_reader_command_entry,
513 - NULL);
514 -
515 - gconf_peditor_new_boolean (NULL,
516 - DEFAULT_APPS_KEY_MAILER_NEEDS_TERM,
517 - capplet->mail_reader_terminal_checkbutton,
518 - NULL);
519 -
520 /* Media player */
521 gconf_peditor_new_combo_box (NULL,
522 DEFAULT_APPS_KEY_MEDIA_EXEC,
523 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h
524 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:30:55.000000000 +0200
525 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:31:26.000000000 +0200
526 @@ -85,17 +85,6 @@
527 GtkWidget *visual_combo_box;
528 GtkWidget *mobility_combo_box;
529
530 - GtkWidget *web_browser_command_entry;
531 - GtkWidget *web_browser_command_label;
532 - GtkWidget *web_browser_terminal_checkbutton;
533 - GtkWidget *default_radiobutton;
534 - GtkWidget *new_win_radiobutton;
535 - GtkWidget *new_tab_radiobutton;
536 -
537 - GtkWidget *mail_reader_command_entry;
538 - GtkWidget *mail_reader_command_label;
539 - GtkWidget *mail_reader_terminal_checkbutton;
540 -
541 GtkWidget *terminal_command_entry;
542 GtkWidget *terminal_command_label;
543 GtkWidget *terminal_exec_flag_entry;
544 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c
545 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-03-27 15:30:55.000000000 +0200
546 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-03-27 15:31:26.000000000 +0200
547 @@ -21,12 +21,12 @@
548 #include "gnome-da-capplet.h"
549 #include "gnome-da-item.h"
550
551 -GnomeDAWebItem*
552 -gnome_da_web_item_new (void)
553 +GnomeDAURLItem*
554 +gnome_da_url_item_new (void)
555 {
556 - GnomeDAWebItem *item = NULL;
557 + GnomeDAURLItem *item = NULL;
558
559 - item = g_new0 (GnomeDAWebItem, 1);
560 + item = g_new0 (GnomeDAURLItem, 1);
561
562 return item;
563 }
564 @@ -72,7 +72,7 @@
565 }
566
567 void
568 -gnome_da_web_item_free (GnomeDAWebItem *item)
569 +gnome_da_url_item_free (GnomeDAURLItem *item)
570 {
571 g_return_if_fail (item != NULL);
572
573 @@ -82,8 +82,7 @@
574 g_free (item->generic.icon_name);
575 g_free (item->generic.icon_path);
576
577 - g_free (item->tab_command);
578 - g_free (item->win_command);
579 + g_object_unref (item->app_info);
580
581 g_free (item);
582 }
583 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h
584 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-03-27 15:30:55.000000000 +0200
585 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-03-27 15:31:26.000000000 +0200
586 @@ -25,7 +25,7 @@
587
588 typedef struct _GnomeDAItem GnomeDAItem;
589
590 -typedef struct _GnomeDAWebItem GnomeDAWebItem;
591 +typedef struct _GnomeDAURLItem GnomeDAURLItem;
592 typedef struct _GnomeDATermItem GnomeDATermItem;
593 typedef struct _GnomeDASimpleItem GnomeDASimpleItem;
594 typedef struct _GnomeDAVisualItem GnomeDAVisualItem;
595 @@ -39,17 +39,14 @@
596 gchar *icon_path;
597 };
598
599 -struct _GnomeDAWebItem {
600 +struct _GnomeDASimpleItem {
601 GnomeDAItem generic;
602 gboolean run_in_terminal;
603 - gboolean netscape_remote;
604 - gchar *tab_command;
605 - gchar *win_command;
606 };
607
608 -struct _GnomeDASimpleItem {
609 +struct _GnomeDAURLItem {
610 GnomeDAItem generic;
611 - gboolean run_in_terminal;
612 + GAppInfo *app_info;
613 };
614
615 struct _GnomeDATermItem {
616 @@ -67,13 +64,13 @@
617 gboolean run_at_startup;
618 };
619
620 -GnomeDAWebItem* gnome_da_web_item_new (void);
621 GnomeDATermItem* gnome_da_term_item_new (void);
622 +GnomeDAURLItem* gnome_da_url_item_new (void);
623 GnomeDASimpleItem* gnome_da_simple_item_new (void);
624 GnomeDAVisualItem* gnome_da_visual_item_new (void);
625 GnomeDAMobilityItem* gnome_da_mobility_item_new (void);
626 -void gnome_da_web_item_free (GnomeDAWebItem *item);
627 void gnome_da_term_item_free (GnomeDATermItem *item);
628 +void gnome_da_url_item_free (GnomeDAURLItem *item);
629 void gnome_da_simple_item_free (GnomeDASimpleItem *item);
630 void gnome_da_visual_item_free (GnomeDAVisualItem *item);
631 void gnome_da_mobility_item_free (GnomeDAMobilityItem *item);
632 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c
633 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:30:55.000000000 +0200
634 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:31:26.000000000 +0200
635 @@ -47,7 +47,7 @@
636 if (!xmlStrncmp (element->name, xml_val_name, len)) {
637 xmlChar *cont = xmlNodeGetContent (element);
638
639 - if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1"))
640 + if (!xmlStrcasecmp (cont, (const xmlChar *) "true") || !xmlStrcasecmp (cont, (const xmlChar *) "1"))
641 ret_val = TRUE;
642 else
643 ret_val = FALSE;
644 @@ -91,7 +91,7 @@
645 }
646 else {
647 for (i = 0; sys_langs[i] != NULL; i++) {
648 - if (!strcmp (sys_langs[i], node_lang)) {
649 + if (!strcmp ((const char *) sys_langs[i], (const char *) node_lang)) {
650 ret_val = (gchar *) xmlNodeGetContent (element);
651 /* since sys_langs is sorted from most desirable to
652 * least desirable, exit at first match
653 @@ -109,7 +109,7 @@
654 }
655
656 static gboolean
657 -is_executable_valid (gchar *executable)
658 +is_executable_valid (const gchar *executable)
659 {
660 gchar *path;
661
662 @@ -129,8 +129,6 @@
663 xmlDoc *xml_doc;
664 xmlNode *root, *section, *element;
665 gchar *executable;
666 - GnomeDAWebItem *web_item;
667 - GnomeDASimpleItem *mail_item;
668 GnomeDASimpleItem *media_item;
669 GnomeDATermItem *term_item;
670 GnomeDAVisualItem *visual_item;
671 @@ -144,56 +142,9 @@
672 root = xmlDocGetRootElement (xml_doc);
673
674 for (section = root->children; section != NULL; section = section->next) {
675 - if (!xmlStrncmp (section->name, "web-browsers", 12)) {
676 + if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) {
677 for (element = section->children; element != NULL; element = element->next) {
678 - if (!xmlStrncmp (element->name, "web-browser", 11)) {
679 - executable = gnome_da_xml_get_string (element, "executable");
680 - if (is_executable_valid (executable)) {
681 - web_item = gnome_da_web_item_new ();
682 -
683 - web_item->generic.name = gnome_da_xml_get_string (element, "name");
684 - web_item->generic.executable = executable;
685 - web_item->generic.command = gnome_da_xml_get_string (element, "command");
686 - web_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
687 -
688 - web_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal");
689 - web_item->netscape_remote = gnome_da_xml_get_bool (element, "netscape-remote");
690 - if (web_item->netscape_remote) {
691 - web_item->tab_command = gnome_da_xml_get_string (element, "tab-command");
692 - web_item->win_command = gnome_da_xml_get_string (element, "win-command");
693 - }
694 -
695 - capplet->web_browsers = g_list_append (capplet->web_browsers, web_item);
696 - }
697 - else
698 - g_free (executable);
699 - }
700 - }
701 - }
702 - else if (!xmlStrncmp (section->name, "mail-readers", 12)) {
703 - for (element = section->children; element != NULL; element = element->next) {
704 - if (!xmlStrncmp (element->name, "mail-reader", 11)) {
705 - executable = gnome_da_xml_get_string (element, "executable");
706 - if (is_executable_valid (executable)) {
707 - mail_item = gnome_da_simple_item_new ();
708 -
709 - mail_item->generic.name = gnome_da_xml_get_string (element, "name");
710 - mail_item->generic.executable = executable;
711 - mail_item->generic.command = gnome_da_xml_get_string (element, "command");
712 - mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
713 -
714 - mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal");
715 -
716 - capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item);
717 - }
718 - else
719 - g_free (executable);
720 - }
721 - }
722 - }
723 - else if (!xmlStrncmp (section->name, "terminals", 9)) {
724 - for (element = section->children; element != NULL; element = element->next) {
725 - if (!xmlStrncmp (element->name, "terminal", 8)) {
726 + if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) {
727 executable = gnome_da_xml_get_string (element, "executable");
728 if (is_executable_valid (executable)) {
729 term_item = gnome_da_term_item_new ();
730 @@ -212,9 +163,9 @@
731 }
732 }
733 }
734 - else if (!xmlStrncmp (section->name, "media-players", 13)) {
735 + else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) {
736 for (element = section->children; element != NULL; element = element->next) {
737 - if (!xmlStrncmp (element->name, "media-player", 12)) {
738 + if (!xmlStrncmp (element->name, (const xmlChar *) "media-player", 12)) {
739 executable = gnome_da_xml_get_string (element, "executable");
740 if (is_executable_valid (executable)) {
741 media_item = gnome_da_simple_item_new ();
742 @@ -233,9 +184,9 @@
743 }
744 }
745 }
746 - else if (!xmlStrncmp (section->name, "a11y-visual", 11)) {
747 + else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) {
748 for (element = section->children; element != NULL; element = element->next) {
749 - if (!xmlStrncmp (element->name, "visual", 6)) {
750 + if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) {
751 executable = gnome_da_xml_get_string (element,"executable");
752 if (is_executable_valid (executable)) {
753 visual_item = gnome_da_visual_item_new ();
754 @@ -254,9 +205,9 @@
755 }
756 }
757 }
758 - else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) {
759 + else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) {
760 for (element = section->children; element != NULL; element = element->next) {
761 - if (!xmlStrncmp (element->name, "mobility", 8)) {
762 + if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) {
763 executable = gnome_da_xml_get_string (element,"executable");
764 if (is_executable_valid (executable)) {
765 mobility_item = gnome_da_mobility_item_new ();
766 @@ -280,11 +231,46 @@
767 xmlFreeDoc (xml_doc);
768 }
769
770 +static GList *
771 +load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme)
772 +{
773 + GList *app_list, *l, *ret;
774 +
775 + app_list = g_app_info_get_all_for_type (scheme);
776 + ret = NULL;
777 +
778 + for (l = app_list; l != NULL; l = l->next) {
779 + const gchar *executable;
780 + GAppInfo *app_info = l->data;
781 +
782 + executable = g_app_info_get_executable (app_info);
783 + if (is_executable_valid (executable)) {
784 + GnomeDAURLItem *url_item;
785 +
786 + url_item = gnome_da_url_item_new ();
787 + url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info));
788 + url_item->generic.executable = g_strdup (executable);
789 + url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info));
790 + url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info));
791 + /* Steal the reference */
792 + url_item->app_info = app_info;
793 +
794 + ret = g_list_prepend (ret, url_item);
795 + } else {
796 + g_object_unref (app_info);
797 + }
798 + }
799 + g_list_free (app_list);
800 +
801 + return g_list_reverse (ret);
802 +}
803 +
804 void
805 gnome_da_xml_load_list (GnomeDACapplet *capplet)
806 {
807 GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL);
808
809 + /* First load all applications from the XML files */
810 if (app_dir != NULL) {
811 const gchar *extra_file;
812 gchar *filename;
813 @@ -299,13 +285,17 @@
814 }
815 g_dir_close (app_dir);
816 }
817 +
818 + /* Now load URL handlers */
819 + capplet->web_browsers = load_url_handlers (capplet, "x-scheme-handler/http");
820 + capplet->mail_readers = load_url_handlers (capplet, "x-scheme-handler/mailto");
821 }
822
823 void
824 gnome_da_xml_free (GnomeDACapplet *capplet)
825 {
826 - g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL);
827 - g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL);
828 + g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL);
829 + g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_item_free, NULL);
830 g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL);
831 g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL);
832 g_list_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL);
833 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui
834 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:30:55.000000000 +0200
835 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:31:26.000000000 +0200
836 @@ -1,4 +1,4 @@
837 -<?xml version="1.0"?>
838 +<?xml version="1.0" encoding="UTF-8"?>
839 <interface>
840 <requires lib="gtk+" version="2.16"/>
841 <!-- interface-naming-policy toplevel-contextual -->
842 @@ -69,122 +69,7 @@
843 </packing>
844 </child>
845 <child>
846 - <object class="GtkTable" id="web_browser_options_table">
847 - <property name="visible">True</property>
848 - <property name="n_rows">4</property>
849 - <property name="n_columns">3</property>
850 - <property name="column_spacing">12</property>
851 - <property name="row_spacing">6</property>
852 - <child>
853 - <object class="GtkEntry" id="web_browser_command_entry">
854 - <property name="visible">True</property>
855 - <property name="can_focus">True</property>
856 - <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
857 - </object>
858 - <packing>
859 - <property name="left_attach">1</property>
860 - <property name="right_attach">2</property>
861 - <property name="top_attach">3</property>
862 - <property name="bottom_attach">4</property>
863 - <property name="y_options"></property>
864 - </packing>
865 - </child>
866 - <child>
867 - <object class="GtkCheckButton" id="web_browser_terminal_checkbutton">
868 - <property name="label" translatable="yes">Run in t_erminal</property>
869 - <property name="visible">True</property>
870 - <property name="sensitive">False</property>
871 - <property name="can_focus">True</property>
872 - <property name="receives_default">False</property>
873 - <property name="use_underline">True</property>
874 - <property name="draw_indicator">True</property>
875 - </object>
876 - <packing>
877 - <property name="left_attach">2</property>
878 - <property name="right_attach">3</property>
879 - <property name="top_attach">3</property>
880 - <property name="bottom_attach">4</property>
881 - <property name="x_options">GTK_FILL</property>
882 - <property name="y_options"></property>
883 - </packing>
884 - </child>
885 - <child>
886 - <object class="GtkRadioButton" id="web_browser_default_radiobutton">
887 - <property name="label" translatable="yes">Open link with web browser _default</property>
888 - <property name="visible">True</property>
889 - <property name="sensitive">False</property>
890 - <property name="can_focus">True</property>
891 - <property name="receives_default">False</property>
892 - <property name="use_underline">True</property>
893 - <property name="active">True</property>
894 - <property name="draw_indicator">True</property>
895 - </object>
896 - <packing>
897 - <property name="right_attach">3</property>
898 - <property name="x_options">GTK_FILL</property>
899 - <property name="y_options"></property>
900 - </packing>
901 - </child>
902 - <child>
903 - <object class="GtkRadioButton" id="web_browser_new_tab_radiobutton">
904 - <property name="label" translatable="yes">Open link in new _tab</property>
905 - <property name="visible">True</property>
906 - <property name="sensitive">False</property>
907 - <property name="can_focus">True</property>
908 - <property name="receives_default">False</property>
909 - <property name="use_underline">True</property>
910 - <property name="draw_indicator">True</property>
911 - <property name="group">web_browser_default_radiobutton</property>
912 - </object>
913 - <packing>
914 - <property name="right_attach">3</property>
915 - <property name="top_attach">2</property>
916 - <property name="bottom_attach">3</property>
917 - <property name="x_options">GTK_FILL</property>
918 - <property name="y_options"></property>
919 - </packing>
920 - </child>
921 - <child>
922 - <object class="GtkRadioButton" id="web_browser_new_win_radiobutton">
923 - <property name="label" translatable="yes">Open link in new _window</property>
924 - <property name="visible">True</property>
925 - <property name="sensitive">False</property>
926 - <property name="can_focus">True</property>
927 - <property name="receives_default">False</property>
928 - <property name="use_underline">True</property>
929 - <property name="draw_indicator">True</property>
930 - <property name="group">web_browser_default_radiobutton</property>
931 - </object>
932 - <packing>
933 - <property name="right_attach">3</property>
934 - <property name="top_attach">1</property>
935 - <property name="bottom_attach">2</property>
936 - <property name="x_options">GTK_FILL</property>
937 - <property name="y_options"></property>
938 - </packing>
939 - </child>
940 - <child>
941 - <object class="GtkLabel" id="web_browser_command_label">
942 - <property name="visible">True</property>
943 - <property name="sensitive">False</property>
944 - <property name="xalign">0</property>
945 - <property name="label" translatable="yes">C_ommand:</property>
946 - <property name="use_underline">True</property>
947 - <property name="mnemonic_widget">web_browser_command_entry</property>
948 - </object>
949 - <packing>
950 - <property name="top_attach">3</property>
951 - <property name="bottom_attach">4</property>
952 - <property name="x_options">GTK_FILL</property>
953 - <property name="y_options"></property>
954 - </packing>
955 - </child>
956 - </object>
957 - <packing>
958 - <property name="expand">False</property>
959 - <property name="fill">False</property>
960 - <property name="position">1</property>
961 - </packing>
962 + <placeholder/>
963 </child>
964 </object>
965 <packing>
966 @@ -250,58 +135,7 @@
967 </packing>
968 </child>
969 <child>
970 - <object class="GtkTable" id="mail_reader_options_table">
971 - <property name="visible">True</property>
972 - <property name="n_columns">3</property>
973 - <property name="column_spacing">12</property>
974 - <property name="row_spacing">6</property>
975 - <child>
976 - <object class="GtkLabel" id="mail_reader_command_label">
977 - <property name="visible">True</property>
978 - <property name="sensitive">False</property>
979 - <property name="xalign">0</property>
980 - <property name="label" translatable="yes">Co_mmand:</property>
981 - <property name="use_underline">True</property>
982 - <property name="mnemonic_widget">mail_reader_command_entry</property>
983 - </object>
984 - <packing>
985 - <property name="x_options">GTK_FILL</property>
986 - <property name="y_options"></property>
987 - </packing>
988 - </child>
989 - <child>
990 - <object class="GtkEntry" id="mail_reader_command_entry">
991 - <property name="visible">True</property>
992 - <property name="can_focus">True</property>
993 - <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property>
994 - </object>
995 - <packing>
996 - <property name="left_attach">1</property>
997 - <property name="right_attach">2</property>
998 - <property name="y_options"></property>
999 - </packing>
1000 - </child>
1001 - <child>
1002 - <object class="GtkCheckButton" id="mail_reader_terminal_checkbutton">
1003 - <property name="label" translatable="yes">Run in t_erminal</property>
1004 - <property name="visible">True</property>
1005 - <property name="sensitive">False</property>
1006 - <property name="can_focus">True</property>
1007 - <property name="receives_default">False</property>
1008 - <property name="use_underline">True</property>
1009 - <property name="draw_indicator">True</property>
1010 - </object>
1011 - <packing>
1012 - <property name="left_attach">2</property>
1013 - <property name="right_attach">3</property>
1014 - <property name="x_options">GTK_FILL</property>
1015 - <property name="y_options"></property>
1016 - </packing>
1017 - </child>
1018 - </object>
1019 - <packing>
1020 - <property name="position">1</property>
1021 - </packing>
1022 + <placeholder/>
1023 </child>
1024 </object>
1025 <packing>
1026 diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in
1027 --- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:30:55.000000000 +0200
1028 +++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:31:26.000000000 +0200
1029 @@ -4,245 +4,6 @@
1030
1031 <!-- Remember to never use the same string for <command>, <tab-command> and <win-command> entries -->
1032
1033 - <web-browsers>
1034 - <web-browser>
1035 - <_name>Opera</_name>
1036 - <executable>opera</executable>
1037 - <command>opera %s</command>
1038 - <icon-name>opera</icon-name>
1039 - <run-in-terminal>false</run-in-terminal>
1040 - <netscape-remote>true</netscape-remote>
1041 - <tab-command>opera -newpage %s</tab-command>
1042 - <win-command>opera -newwindow %s</win-command>
1043 - </web-browser>
1044 - <web-browser>
1045 - <_name>Debian Sensible Browser</_name>
1046 - <executable>sensible-browser</executable>
1047 - <command>sensible-browser %s</command>
1048 - <icon-name></icon-name>
1049 - <run-in-terminal>false</run-in-terminal>
1050 - <netscape-remote>false</netscape-remote>
1051 - </web-browser>
1052 - <web-browser>
1053 - <_name>Epiphany Web Browser</_name>
1054 - <executable>epiphany</executable>
1055 - <command>epiphany %s</command>
1056 - <icon-name>web-browser</icon-name>
1057 - <run-in-terminal>false</run-in-terminal>
1058 - <netscape-remote>true</netscape-remote>
1059 - <tab-command>epiphany --new-tab %s</tab-command>
1060 - <win-command>epiphany --new-window %s</win-command>
1061 - </web-browser>
1062 - <web-browser>
1063 - <_name>Galeon</_name>
1064 - <executable>galeon</executable>
1065 - <command>galeon %s</command>
1066 - <icon-name>galeon</icon-name>
1067 - <run-in-terminal>false</run-in-terminal>
1068 - <netscape-remote>true</netscape-remote>
1069 - <tab-command>galeon -n %s</tab-command>
1070 - <win-command>galeon -w %s</win-command>
1071 - </web-browser>
1072 - <web-browser>
1073 - <_name>Encompass</_name>
1074 - <executable>encompass</executable>
1075 - <command>encompass %s</command>
1076 - <icon-name>encompass</icon-name>
1077 - <run-in-terminal>false</run-in-terminal>
1078 - <netscape-remote>false</netscape-remote>
1079 - </web-browser>
1080 - <web-browser>
1081 - <_name>Firebird</_name>
1082 - <executable>mozilla-firebird</executable>
1083 - <command>mozilla-firebird %s</command>
1084 - <icon-name></icon-name>
1085 - <run-in-terminal>false</run-in-terminal>
1086 - <netscape-remote>true</netscape-remote>
1087 - <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
1088 - <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
1089 - </web-browser>
1090 - <web-browser>
1091 - <_name>Firefox</_name>
1092 - <executable>firefox</executable>
1093 - <command>firefox %s</command>
1094 - <icon-name>firefox</icon-name>
1095 - <run-in-terminal>false</run-in-terminal>
1096 - <netscape-remote>true</netscape-remote>
1097 - <tab-command>firefox -new-tab "%s"</tab-command>
1098 - <win-command>firefox -new-window "%s"</win-command>
1099 - </web-browser>
1100 - <web-browser>
1101 - <_name>Iceweasel</_name>
1102 - <executable>iceweasel</executable>
1103 - <command>iceweasel %s</command>
1104 - <icon-name>iceweasel</icon-name>
1105 - <run-in-terminal>false</run-in-terminal>
1106 - <netscape-remote>true</netscape-remote>
1107 - <tab-command>iceweasel -new-tab "%s"</tab-command>
1108 - <win-command>iceweasel -new-window "%s"</win-command>
1109 - </web-browser>
1110 - <web-browser>
1111 - <_name>Mozilla 1.6</_name>
1112 - <executable>mozilla-1.6</executable>
1113 - <command>mozilla-1.6 %s</command>
1114 - <icon-name>mozilla-icon</icon-name>
1115 - <run-in-terminal>false</run-in-terminal>
1116 - <netscape-remote>true</netscape-remote>
1117 - <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
1118 - <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
1119 - </web-browser>
1120 - <web-browser>
1121 - <_name>Mozilla</_name>
1122 - <executable>mozilla</executable>
1123 - <command>mozilla %s</command>
1124 - <icon-name>mozilla-icon</icon-name>
1125 - <run-in-terminal>false</run-in-terminal>
1126 - <netscape-remote>true</netscape-remote>
1127 - <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
1128 - <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
1129 - </web-browser>
1130 - <web-browser>
1131 - <_name>SeaMonkey</_name>
1132 - <executable>seamonkey</executable>
1133 - <command>seamonkey %s</command>
1134 - <icon-name>seamonkey</icon-name>
1135 - <run-in-terminal>false</run-in-terminal>
1136 - <netscape-remote>true</netscape-remote>
1137 - <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
1138 - <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
1139 - </web-browser>
1140 - <web-browser>
1141 - <_name>Iceape</_name>
1142 - <executable>iceape</executable>
1143 - <command>iceape %s</command>
1144 - <icon-name>iceape</icon-name>
1145 - <run-in-terminal>false</run-in-terminal>
1146 - <netscape-remote>true</netscape-remote>
1147 - <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
1148 - <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
1149 - </web-browser>
1150 - <web-browser>
1151 - <_name>Netscape Communicator</_name>
1152 - <executable>netscape</executable>
1153 - <command>netscape %s</command>
1154 - <icon-name>netscape</icon-name>
1155 - <run-in-terminal>false</run-in-terminal>
1156 - <netscape-remote>true</netscape-remote>
1157 - <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
1158 - <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
1159 - </web-browser>
1160 - <web-browser>
1161 - <_name>Konqueror</_name>
1162 - <executable>konqueror</executable>
1163 - <command>konqueror %s</command>
1164 - <icon-name>konqueror</icon-name>
1165 - <run-in-terminal>false</run-in-terminal>
1166 - <netscape-remote>false</netscape-remote>
1167 - </web-browser>
1168 - <web-browser>
1169 - <_name>Midori</_name>
1170 - <executable>midori</executable>
1171 - <command>midori %s</command>
1172 - <icon-name>midori</icon-name>
1173 - <run-in-terminal>false</run-in-terminal>
1174 - <netscape-remote>false</netscape-remote>
1175 - </web-browser>
1176 - </web-browsers>
1177 -
1178 - <mail-readers>
1179 - <mail-reader>
1180 - <_name>Evolution Mail Reader</_name>
1181 - <executable>evolution</executable>
1182 - <command>evolution %s</command>
1183 - <icon-name>evolution</icon-name>
1184 - <run-in-terminal>false</run-in-terminal>
1185 - </mail-reader>
1186 - <mail-reader>
1187 - <_name>Balsa</_name>
1188 - <executable>balsa</executable>
1189 - <command>balsa -m %s</command>
1190 - <icon-name>gnome-balsa2</icon-name>
1191 - <run-in-terminal>false</run-in-terminal>
1192 - </mail-reader>
1193 - <mail-reader>
1194 - <_name>KMail</_name>
1195 - <executable>kmail</executable>
1196 - <command>kmail %s</command>
1197 - <icon-name>kmail</icon-name>
1198 - <run-in-terminal>false</run-in-terminal>
1199 - </mail-reader>
1200 - <mail-reader>
1201 - <_name>Icedove</_name>
1202 - <executable>icedove</executable>
1203 - <command>icedove %s</command>
1204 - <icon-name>icedove</icon-name>
1205 - <run-in-terminal>false</run-in-terminal>
1206 - </mail-reader>
1207 - <mail-reader>
1208 - <_name>Thunderbird</_name>
1209 - <executable>thunderbird</executable>
1210 - <command>thunderbird %s</command>
1211 - <icon-name>thunderbird</icon-name>
1212 - <run-in-terminal>false</run-in-terminal>
1213 - </mail-reader>
1214 - <mail-reader>
1215 - <_name>Mozilla Thunderbird</_name>
1216 - <executable>mozilla-thunderbird</executable>
1217 - <command>mozilla-thunderbird %s</command>
1218 - <icon-name>thunderbird</icon-name>
1219 - <run-in-terminal>false</run-in-terminal>
1220 - </mail-reader>
1221 - <mail-reader>
1222 - <_name>Mozilla Mail</_name>
1223 - <executable>mozilla</executable>
1224 - <command>mozilla -mail %s</command>
1225 - <icon-name>mozilla-mail-icon</icon-name>
1226 - <run-in-terminal>false</run-in-terminal>
1227 - </mail-reader>
1228 - <mail-reader>
1229 - <_name>SeaMonkey Mail</_name>
1230 - <executable>seamonkey</executable>
1231 - <command>seamonkey -mail %s</command>
1232 - <icon-name>seamonkey</icon-name>
1233 - <run-in-terminal>false</run-in-terminal>
1234 - </mail-reader>
1235 - <mail-reader>
1236 - <_name>Iceape Mail</_name>
1237 - <executable>iceape</executable>
1238 - <command>iceape -mail %s</command>
1239 - <icon-name>iceape</icon-name>
1240 - <run-in-terminal>false</run-in-terminal>
1241 - </mail-reader>
1242 - <mail-reader>
1243 - <_name>Mutt</_name>
1244 - <executable>mutt</executable>
1245 - <command>mutt %s</command>
1246 - <icon-name>gnome-mime-application-x-executable</icon-name>
1247 - <run-in-terminal>true</run-in-terminal>
1248 - </mail-reader>
1249 - <mail-reader>
1250 - <_name>Claws Mail</_name>
1251 - <executable>claws-mail</executable>
1252 - <command>claws-mail --compose %s</command>
1253 - <icon-name>claws-mail</icon-name>
1254 - <run-in-terminal>false</run-in-terminal>
1255 - </mail-reader>
1256 - <mail-reader>
1257 - <_name>Sylpheed-Claws</_name>
1258 - <executable>sylpheed-claws</executable>
1259 - <command>sylpheed-claws --compose %s</command>
1260 - <icon-name>sylpheed</icon-name>
1261 - <run-in-terminal>false</run-in-terminal>
1262 - </mail-reader>
1263 - <mail-reader>
1264 - <_name>Sylpheed</_name>
1265 - <executable>sylpheed</executable>
1266 - <command>sylpheed --compose %s</command>
1267 - <icon-name>sylpheed</icon-name>
1268 - <run-in-terminal>false</run-in-terminal>
1269 - </mail-reader>
1270 - </mail-readers>
1271 -
1272 <terminals>
1273 <terminal>
1274 <_name>Debian Terminal Emulator</_name>

  ViewVC Help
Powered by ViewVC 1.1.20