Added bug numbers to FIXMEs.
* modules/http-method.c: * modules/newftp-method.c: (do_open_directory), (do_make_directory): * modules/pipe-method.c: (do_close): * test/gnome-file-selection/gicon.c: (get_stock_icon), (get_stock_overlay), (get_default_icon), (gicon_get_icon_for_file_2): * test/gnome-file-selection/gnome-file-selection-history.c: * test/gnome-file-selection/gnome-file-selection.c: (update_directory_combo_list), (setup_directory_combo_and_toolbar), (destroy), (class_init), (init): * test/test-info.c: Added bug numbers to FIXMEs. * mime-type-capplet/edit-window.c: (destruction_handler), (initialize_main_win), (launch_edit_window), (populate_application_menu): Got rid of the fixed-length mime_string field. * modules/file-method.c: (read_link), (get_stat_info): Some minor tweaks on the code Rebecca just checked in. There was a little problem with unsigned integers.
This commit is contained in:
parent
09a0f4d208
commit
81136fedf1
1 changed files with 7 additions and 5 deletions
|
@ -46,8 +46,8 @@ typedef struct {
|
|||
GtkWidget *ext_remove_button;
|
||||
GtkWidget *application_menu;
|
||||
GtkWidget *component_menu;
|
||||
char mime_string[256]; /* FIXME: Find out max length of mime string */
|
||||
GList *tmp_ext[2];
|
||||
char *mime_string;
|
||||
GList *tmp_ext[2];
|
||||
GtkFileSelection *file_selector;
|
||||
} edit_window;
|
||||
|
||||
|
@ -63,6 +63,7 @@ static GtkFileSelection *show_file_selector (const char *title, gpointer
|
|||
static void
|
||||
destruction_handler (GtkWidget *widget, gpointer data)
|
||||
{
|
||||
g_free (main_win->mime_string);
|
||||
g_free (main_win);
|
||||
main_win = NULL;
|
||||
}
|
||||
|
@ -167,7 +168,7 @@ initialize_main_win ()
|
|||
|
||||
gchar *title[2] = {"Extensions"};
|
||||
|
||||
main_win = g_new (edit_window, 1);
|
||||
main_win = g_new0 (edit_window, 1);
|
||||
main_win->window = gnome_dialog_new ("",
|
||||
GNOME_STOCK_BUTTON_OK,
|
||||
GNOME_STOCK_BUTTON_CANCEL,
|
||||
|
@ -387,7 +388,8 @@ launch_edit_window (const char *mime_type)
|
|||
initialize_main_win ();
|
||||
}
|
||||
|
||||
strcpy (main_win->mime_string, mime_type);
|
||||
g_free (main_win->mime_string);
|
||||
main_win->mime_string = g_strdup (mime_type);
|
||||
main_win->tmp_ext[0] = NULL;
|
||||
main_win->tmp_ext[1] = NULL;
|
||||
|
||||
|
@ -513,7 +515,7 @@ populate_application_menu (GtkWidget *application_menu, const char *mime_type)
|
|||
/* See if we have a match */
|
||||
if (found_match) {
|
||||
/* Have menu appear with default application selected */
|
||||
gtk_menu_set_active ( GTK_MENU (new_menu), index);
|
||||
gtk_menu_set_active (GTK_MENU (new_menu), index);
|
||||
} else {
|
||||
/* FIXME: What should we do in this case? */
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue