comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- vv
- changeset 26611
- 5d52410f6ea8
- parent 26599
- 191be70922b2
- child 26753
- a8dca8faae69
equal
deleted
inserted
replaced
| 26525:ad90b00d3bc7 | 26611:5d52410f6ea8 |
|---|---|
| 2449 const char *current_folder; | 2449 const char *current_folder; |
| 2450 | 2450 |
| 2451 dialog->callback = callback; | 2451 dialog->callback = callback; |
| 2452 dialog->data = data; | 2452 dialog->data = data; |
| 2453 | 2453 |
| 2454 if (dialog->icon_filesel != NULL) { | |
| 2455 gtk_window_present(GTK_WINDOW(dialog->icon_filesel)); | |
| 2456 return NULL; | |
| 2457 } | |
| 2458 | |
| 2459 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder"); | 2454 current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder"); |
| 2460 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ | 2455 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ |
| 2461 | 2456 |
| 2462 dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"), | 2457 dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"), |
| 2463 parent, | 2458 parent, |
| 3581 | 3576 |
| 3582 tmp = g_find_program_in_path("gconftool-2"); | 3577 tmp = g_find_program_in_path("gconftool-2"); |
| 3583 if (tmp == NULL) | 3578 if (tmp == NULL) |
| 3584 return FALSE; | 3579 return FALSE; |
| 3585 | 3580 |
| 3581 g_free(tmp); | |
| 3586 tmp = NULL; | 3582 tmp = NULL; |
| 3583 | |
| 3587 if (!g_spawn_command_line_sync("gconftool-2 --all-dirs /desktop/gnome/url-handlers", | 3584 if (!g_spawn_command_line_sync("gconftool-2 --all-dirs /desktop/gnome/url-handlers", |
| 3588 &tmp, &err, NULL, NULL)) | 3585 &tmp, &err, NULL, NULL)) |
| 3589 { | 3586 { |
| 3590 g_free(tmp); | 3587 g_free(tmp); |
| 3591 g_free(err); | 3588 g_free(err); |
