diff options
26 files changed, 242 insertions, 189 deletions
@@ -1,3 +1,71 @@ +2001-01-04 Darin Adler <darin@eazel.com> + + Some FIXME cleanup. + + * components/help/converters/gnome-db2html2/sect-elements.c: + (sect_article_end_element), (sect_inlinegraphic_start_element): + * components/help/converters/gnome-db2html2/toc-elements.c: + (toc_sect_end_element): + * components/mozilla/mozilla-events.cpp: + * components/mozilla/nautilus-mozilla-content-view.c: + (make_full_uri_from_relative), (eazel_services_scheme_translate): + * components/music/nautilus-music-view.c: + (nautilus_music_view_initialize), + (music_view_set_selected_song_title), (reset_playtime), + (play_status_display), (slider_moved_callback), + (add_play_controls): + * components/notes/nautilus-notes.c: (notes_load_metainfo): + * components/services/install/lib/eazel-install-logic.c: + (eazel_install_check_for_file_conflicts), + (eazel_install_do_transaction_all_files_check), + (eazel_install_prune_packages_helper), + (eazel_install_check_existing_packages): + * libnautilus-extensions/nautilus-string.c: (nautilus_strcmp), + (nautilus_strcasecmp), (nautilus_strcmp_case_breaks_ties), + (nautilus_strcoll), (nautilus_str_is_equal), + (nautilus_istr_is_equal), (nautilus_strcmp_compare_func), + (nautilus_strcoll_compare_func), + (nautilus_strcasecmp_compare_func): + * src/file-manager/fm-directory-view.c: (open_location): + * src/nautilus-first-time-druid.c: (make_anti_aliased_label), + (make_hbox_user_level_radio_button), (set_up_user_level_page): + Added bug numbers to FIXMEs. At one point Josh made some bugs for + FIXMEs but never got around to checking in the bug numbers in the + source code. And I wrote one bug report. + + * components/music/nautilus-music-view.c: + (nautilus_music_view_initialize): Removed a fixed FIXME. Also got + rid of a hard-coded constant and took excess spaces out of some + string constants. + + * components/services/install/lib/eazel-install-object.c: + (eazel_install_emit_dependency_check_default): Changed a FIXME + into a non-FIXME comment, now the the bug is fixed. + + * components/services/install/lib/eazel-package-system-rpm3.c: + (rpm_packagedata_fill_from_file): Removed an incorrect bug number + from a FIXME. + + * components/services/install/nautilus-view/nautilus-service-install-view.h: + * components/services/install/nautilus-view/nautilus-service-install-view.c: + (nautilus_service_install_installing): Removed the FIXME from a + comment that's about how a bug was fixed. + + * components/services/trilobite/libtrilobite/trilobite-md5-tools.h: + * components/services/trilobite/libtrilobite/trilobite-md5-tools.c: + * docs/style-guide.html: + Removed FIXME and corrected misunderstanding about whether use of + the guchar typedef is recommended in Nautilus coding style. + + * libnautilus-extensions/nautilus-gdk-font-extensions.h: + * libnautilus-extensions/nautilus-gdk-font-extensions.c: + Removed misguided use of const in here. Gdk and Gtk object types + just aren't suitable for const, and you end up doing type casts + that defeat the purpose. + + * src/nautilus-window-manage-views.c: (load_underway_callback): + Remove a FIXME for a fixed bug. + 2001-01-04 Robey Pointer <robey@eazel.com> * components/services/install/command-line/eazel-alt-install-corba. diff --git a/components/help/converters/gnome-db2html2/sect-elements.c b/components/help/converters/gnome-db2html2/sect-elements.c index d331963db..095b4f8d2 100644 --- a/components/help/converters/gnome-db2html2/sect-elements.c +++ b/components/help/converters/gnome-db2html2/sect-elements.c @@ -261,7 +261,7 @@ sect_article_end_element (Context *context, const gchar *name) } g_print ("</TABLE>"); } - /* FIXME: Is the below needed now that we have the footer printed out */ + /* FIXME bugzilla.eazel.com 4408: Is the below needed now that we have the footer printed out */ /* sect_print (context, "</BODY>\n</HEAD>\n"); */ } @@ -1139,7 +1139,7 @@ sect_inlinegraphic_start_element (Context *context, return; } - /* FIXME: Should we put an 'ALT' tag here? */ + /* FIXME bugzilla.eazel.com 4407: Should we put an 'ALT' tag here? */ if (format == NULL) { /* Default is PNG */ sect_print (context, "<IMG SRC=\"file://%s%s.png\">", context->base_path, fileref); diff --git a/components/help/converters/gnome-db2html2/toc-elements.c b/components/help/converters/gnome-db2html2/toc-elements.c index 3afdadec3..ec06ae8b8 100644 --- a/components/help/converters/gnome-db2html2/toc-elements.c +++ b/components/help/converters/gnome-db2html2/toc-elements.c @@ -273,7 +273,7 @@ toc_sect_end_element (Context *context, switch (name[4]) { case 'a': - /* FIXME: should chapter be set to zero? */ + /* FIXME bugzilla.eazel.com 4410: should chapter be set to zero? */ context->preface = 0; context->sect1 = 0; break; @@ -293,7 +293,7 @@ toc_sect_end_element (Context *context, context->sect5 = 0; break; case 'n': - /* FIXME: should chapter be set to zero? */ + /* FIXME bugzilla.eazel.com 4410: should chapter be set to zero? */ context->appendix = 0; context->sect1 = 0; break; diff --git a/components/mozilla/mozilla-events.cpp b/components/mozilla/mozilla-events.cpp index 5b0598ac0..5d5e73c52 100644 --- a/components/mozilla/mozilla-events.cpp +++ b/components/mozilla/mozilla-events.cpp @@ -152,7 +152,8 @@ mozilla_events_get_href_for_mouse_event (gpointer mouse_event) /* * returns TRUE if the given event occurs in a SUBMIT button to a form with method=POST */ -/* FIXME this doesn't handle form submissions with a BUTTON or by hitting <return> */ +/* FIXME bugzilla.eazel.com 4411: this doesn't handle form submissions + with a BUTTON or by hitting <return> */ extern "C" gboolean mozilla_events_is_in_form_POST_submit (gpointer mouse_event) { diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c index 6dc31e29b..b646567a6 100644 --- a/components/mozilla/nautilus-mozilla-content-view.c +++ b/components/mozilla/nautilus-mozilla-content-view.c @@ -916,9 +916,9 @@ make_full_uri_from_relative (const char *base_uri, const char *uri) /* See section 5.2 in RFC 2396 */ - /* FIXME This function does not take into account a BASE tag - * in an HTML document, so its functionality differs - * from what Mozilla itself would do. + /* FIXME bugzilla.eazel.com 4413: This function does not take + * into account a BASE tag in an HTML document, so its + * functionality differs from what Mozilla itself would do. */ if (is_uri_partial (uri)) { @@ -1303,7 +1303,7 @@ eazel_services_scheme_translate (NautilusMozillaContentView *view, parsed = ammonite_url_parse (uri); g_assert (parsed); - /*FIXME it's possible that "view" will be gone by the time the reponse comes back */ + /* FIXME bugzilla.eazel.com 4412: it's possible that "view" will be gone by the time the reponse comes back */ if (! ammonite_do_prompt_login_async (parsed->user, NULL, NULL, p_state, prompt_login_cb) ) { ret = NULL; g_free (p_state->uri); diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index d0a900695..ed2b782a9 100644 --- a/components/music/nautilus-music-view.c +++ b/components/music/nautilus-music-view.c @@ -232,9 +232,8 @@ nautilus_music_view_initialize (NautilusMusicView *music_view) GtkWidget *label; GtkWidget *button; GtkCList *clist; - /* FIXME: I think this is not portable. It works in gcc, but not other C compilers. */ - char *titles[] = {N_("Track "), N_("Title"), N_("Artist"), N_("Year"), N_("Bitrate "), N_("Time "), N_("Album"), N_("Comment"), N_("Channels"), N_("Sample Rate"),}; - int i; + char *titles[] = { N_("Track"), N_("Title"), N_("Artist"), N_("Year"), N_("Bit Rate"), N_("Time"), N_("Album"), N_("Comment"), N_("Channels"), N_("Sample Rate") }; + guint i; music_view->details = g_new0 (NautilusMusicViewDetails, 1); @@ -259,7 +258,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view) /* allocate a widget for the album title */ music_view->details->album_title = nautilus_label_new (""); - /* FIXME: Hardcoded font and size! */ + /* FIXME bugzilla.eazel.com 4418: Hardcoded font and size! */ nautilus_label_set_font_from_components (NAUTILUS_LABEL (music_view->details->album_title), "helvetica", "medium", NULL, NULL); nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->album_title), 20); @@ -268,7 +267,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view) gtk_widget_show (music_view->details->album_title); /* Localize the titles */ - for (i = 0; i < 10; i++) { + for (i = 0; i < NAUTILUS_N_ELEMENTS (titles); i++) { titles[i] = _(titles[i]); } @@ -443,7 +442,7 @@ music_view_set_selected_song_title (NautilusMusicView *music_view, int row) gtk_clist_get_text (GTK_CLIST(music_view->details->song_list), row, 5, &temp_str); if (temp_str != NULL && strlen (temp_str) > 0) { nautilus_label_set_text (NAUTILUS_LABEL (music_view->details->total_track_time), temp_str); - /* FIXME: Hard-coded font size. */ + /* FIXME bugzilla.eazel.com 4418: Hard-coded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->total_track_time), 14); } } @@ -1060,7 +1059,7 @@ reset_playtime (NautilusMusicView *music_view) GTK_ADJUSTMENT (music_view->details->playtime_adjustment)); gtk_widget_set_sensitive (music_view->details->playtime_bar, FALSE); nautilus_label_set_text (NAUTILUS_LABEL (music_view->details->playtime), "--:--"); - /* FIXME: Hard-coded font size. */ + /* FIXME bugzilla.eazel.com 4418: Hard-coded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->playtime), 14); } @@ -1110,7 +1109,7 @@ play_status_display (NautilusMusicView *music_view) if (!music_view->details->slider_dragging) { nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime), play_time_str); - /* FIXME: Hard-coded font size. */ + /* FIXME bugzilla.eazel.com 4418: Hard-coded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->playtime), 14); } } @@ -1378,7 +1377,7 @@ slider_moved_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime), temp_str); - /* FIXME: Hardcoded font size. */ + /* FIXME bugzilla.eazel.com 4418: Hardcoded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->playtime), 14); } return FALSE; @@ -1494,7 +1493,7 @@ add_play_controls (NautilusMusicView *music_view) gtk_table_set_col_spacings (GTK_TABLE (table), 1); music_view->details->song_label = nautilus_label_new (""); - /* FIXME: Hardcoded font and size. */ + /* FIXME bugzilla.eazel.com 4418: Hardcoded font and size. */ nautilus_label_set_font_from_components (NAUTILUS_LABEL (music_view->details->song_label), "helvetica", "medium", NULL, NULL); nautilus_label_set_font_size (NAUTILUS_LABEL (music_view->details->song_label), 14); @@ -1632,7 +1631,7 @@ add_play_controls (NautilusMusicView *music_view) #if 0 if (!music_view->details->sound_enabled) { label = nautilus_label_new (_("Sound hardware missing or busy!")); - /* FIXME: Hard-coded font size. */ + /* FIXME bugzilla.eazel.com 4418: Hard-coded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (label), 12); nautilus_label_set_text_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_RED); gtk_widget_show (label); diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c index 0bd04b6d8..c20979c34 100644 --- a/components/notes/nautilus-notes.c +++ b/components/notes/nautilus-notes.c @@ -109,7 +109,7 @@ notes_load_metainfo (Notes *notes) return; } - /* FIXME: should monitor file metadata, not just call_when_ready */ + /* FIXME bugzilla.eazel.com 4422: should monitor file metadata, not just call_when_ready */ attributes = g_list_append (NULL, NAUTILUS_FILE_ATTRIBUTE_METADATA); nautilus_file_call_when_ready (notes->file, attributes, finish_loading_note, notes); diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c index e05126d30..63cb21d55 100644 --- a/components/services/install-view/nautilus-service-install-view.c +++ b/components/services/install-view/nautilus-service-install-view.c @@ -767,9 +767,7 @@ nautilus_service_install_installing (EazelInstallCallback *cb, const PackageData show_overall_feedback (view, out); g_free (out); - /* Crude fix for - FIXME bugzilla.eazel.com 3431 - */ + /* Crude fix. See bugzilla.eazel.com bug 3431 for details. */ if (pack->name) { if (g_strncasecmp (pack->name, "nautilus", 8)==0) { view->details->core_package = TRUE; diff --git a/components/services/install-view/nautilus-service-install-view.h b/components/services/install-view/nautilus-service-install-view.h index 0fde6f1b5..72c430eac 100644 --- a/components/services/install-view/nautilus-service-install-view.h +++ b/components/services/install-view/nautilus-service-install-view.h @@ -83,9 +83,7 @@ struct _NautilusServiceInstallViewDetails { EazelInstallProblem *problem; TrilobiteRootClient *root_client; GList *categories; - /* Crude fix for - FIXME bugzilla.eazel.com 3431 - */ + gboolean core_package; GList *problem_cases; diff --git a/components/services/install/lib/eazel-install-logic.c b/components/services/install/lib/eazel-install-logic.c index e70f97410..02dfdddb1 100644 --- a/components/services/install/lib/eazel-install-logic.c +++ b/components/services/install/lib/eazel-install-logic.c @@ -349,7 +349,7 @@ eazel_install_check_for_file_conflicts (EazelInstall *service, if (g_list_length (owners) > 1) { GList *pit; - /* FIXME: bugzilla.eazel.com 2959 + /* FIXME bugzilla.eazel.com 3511: More than one packages owns this file, this cannot happen (or should not at least) */ @@ -783,7 +783,7 @@ eazel_install_do_transaction_all_files_check (EazelInstall *service, result = FALSE; /* Need to fail the package here to fully fix bug - FIXME: bugzilla.eazel.com 3374 */ + FIXME bugzilla.eazel.com 3374: */ trilobite_debug ("Conflict between %s and %s", req->package->name, req->required->name); req->package->status = PACKAGE_FILE_CONFLICT; req->required->status = PACKAGE_FILE_CONFLICT; @@ -1090,7 +1090,7 @@ eazel_install_prune_packages_helper (EazelInstall *service, PackageData *super; super = (PackageData*)iterator->data; - /* FIXME bugzilla.eazel.com: 3542 + /* FIXME bugzilla.eazel.com 3542: This is the cause of 3542. In this specific case, gnome-print is removed from the toplevel and from 1st sublevel of soft_deps. @@ -1206,7 +1206,7 @@ eazel_install_check_existing_packages (EazelInstall *service, trilobite_debug ("(which is dangerous by the way....)"); trilobite_debug ("rpm -e --nodeps `rpm -q %s`", pack->name); trilobite_debug ("Or wait for the author to fix bug 3511"); - /* FIXME bugzilla.eazel.com: 3511 */ + /* FIXME bugzilla.eazel.com 3511 */ g_assert_not_reached (); } for (iterator = existing_packages; iterator; iterator = g_list_next (iterator)) { diff --git a/components/services/install/lib/eazel-install-object.c b/components/services/install/lib/eazel-install-object.c index 4c9be4e64..11792eea1 100644 --- a/components/services/install/lib/eazel-install-object.c +++ b/components/services/install/lib/eazel-install-object.c @@ -1541,8 +1541,10 @@ eazel_install_emit_dependency_check_default (EazelInstall *service, corbapack = corba_packagedatastruct_from_packagedata (pack); corbaneeds = corba_packagedatastruct_from_packagedata (needs); - /* FIXME: bugzilla.eazel.com 3460 - once 3460 is fixed, remove this hack + /* An old hack that we removed when we fixed bug 3460. + * We should delete it some day. + */ + /* if (needs->name == NULL && needs->provides) { CORBA_free (corbaneeds->name); corbaneeds->name = CORBA_string_dup (needs->provides->data); diff --git a/components/services/install/lib/eazel-package-system-rpm3.c b/components/services/install/lib/eazel-package-system-rpm3.c index e077826e4..08d4c3c93 100644 --- a/components/services/install/lib/eazel-package-system-rpm3.c +++ b/components/services/install/lib/eazel-package-system-rpm3.c @@ -609,7 +609,7 @@ rpm_packagedata_fill_from_file (EazelPackageSystemRpm3 *system, pack->filename = g_strdup (filename); } - /* FIXME: bugzilla.eazel.com 4862 */ + /* FIXME: Would be better to call a package_data_ function to do this. */ if (pack->packsys_struc) { headerFree ((Header) pack->packsys_struc); } diff --git a/components/services/install/nautilus-view/nautilus-service-install-view.c b/components/services/install/nautilus-view/nautilus-service-install-view.c index e05126d30..63cb21d55 100644 --- a/components/services/install/nautilus-view/nautilus-service-install-view.c +++ b/components/services/install/nautilus-view/nautilus-service-install-view.c @@ -767,9 +767,7 @@ nautilus_service_install_installing (EazelInstallCallback *cb, const PackageData show_overall_feedback (view, out); g_free (out); - /* Crude fix for - FIXME bugzilla.eazel.com 3431 - */ + /* Crude fix. See bugzilla.eazel.com bug 3431 for details. */ if (pack->name) { if (g_strncasecmp (pack->name, "nautilus", 8)==0) { view->details->core_package = TRUE; diff --git a/components/services/install/nautilus-view/nautilus-service-install-view.h b/components/services/install/nautilus-view/nautilus-service-install-view.h index 0fde6f1b5..72c430eac 100644 --- a/components/services/install/nautilus-view/nautilus-service-install-view.h +++ b/components/services/install/nautilus-view/nautilus-service-install-view.h @@ -83,9 +83,7 @@ struct _NautilusServiceInstallViewDetails { EazelInstallProblem *problem; TrilobiteRootClient *root_client; GList *categories; - /* Crude fix for - FIXME bugzilla.eazel.com 3431 - */ + gboolean core_package; GList *problem_cases; diff --git a/components/services/trilobite/libtrilobite/trilobite-md5-tools.c b/components/services/trilobite/libtrilobite/trilobite-md5-tools.c index dcee501da..ebb19add8 100644 --- a/components/services/trilobite/libtrilobite/trilobite-md5-tools.c +++ b/components/services/trilobite/libtrilobite/trilobite-md5-tools.c @@ -45,7 +45,7 @@ static union _endian { int i; char b[4]; } *_endian = (union _endian *)&_ie; * Note: this code is harmless on little-endian machines. */ static void -_byte_reverse (unsigned char *buf, guint32 longs) +_byte_reverse (guchar *buf, guint32 longs) { guint32 t; do { @@ -92,7 +92,7 @@ md5_init (MD5Context *ctx) * of bytes. Use this to progressively construct an md5 hash. **/ static void -md5_update (MD5Context *ctx, const unsigned char *buf, guint32 len) +md5_update (MD5Context *ctx, const guchar *buf, guint32 len) { guint32 t; @@ -108,7 +108,7 @@ md5_update (MD5Context *ctx, const unsigned char *buf, guint32 len) /* Handle any leading odd-sized chunks */ if (t) { - unsigned char *p = (unsigned char *) ctx->in + t; + guchar *p = (guchar *) ctx->in + t; t = 64 - t; if (len < t) { @@ -154,10 +154,10 @@ md5_update (MD5Context *ctx, const unsigned char *buf, guint32 len) * copy the final md5 hash to a bufer **/ static void -md5_final (MD5Context *ctx, unsigned char digest[16]) +md5_final (MD5Context *ctx, guchar digest[16]) { guint32 count; - unsigned char *p; + guchar *p; /* Compute number of bytes mod 64 */ count = (ctx->bits[0] >> 3) & 0x3F; @@ -193,7 +193,7 @@ md5_final (MD5Context *ctx, unsigned char digest[16]) md5_transform (ctx->buf, (guint32 *) ctx->in); if (ctx->doByteReverse) - _byte_reverse ((unsigned char *) ctx->buf, 4); + _byte_reverse ((guchar *) ctx->buf, 4); memcpy (digest, ctx->buf, 16); } @@ -314,7 +314,7 @@ md5_transform (guint32 buf[4], const guint32 in[16]) * the 16 bytes buffer @digest . **/ void -trilobite_md5_get_digest (const char *buffer, int buffer_size, unsigned char digest[16]) +trilobite_md5_get_digest (const char *buffer, int buffer_size, guchar digest[16]) { MD5Context ctx; @@ -334,10 +334,10 @@ trilobite_md5_get_digest (const char *buffer, int buffer_size, unsigned char dig * the 16 bytes buffer @digest . **/ void -trilobite_md5_get_digest_from_file (const char *filename, unsigned char digest[16]) +trilobite_md5_get_digest_from_file (const char *filename, guchar digest[16]) { MD5Context ctx; - unsigned char tmp_buf[1024]; + guchar tmp_buf[1024]; int nb_bytes_read; FILE *fp; @@ -352,7 +352,7 @@ trilobite_md5_get_digest_from_file (const char *filename, unsigned char digest[1 return; } - while ((nb_bytes_read = fread (tmp_buf, sizeof (unsigned char), 1024, fp)) > 0) + while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) > 0) md5_update (&ctx, tmp_buf, nb_bytes_read); if (ferror(fp)) { @@ -391,7 +391,7 @@ trilobite_md5_get_digest_from_md5_string (const char *md5string, } const char * -trilobite_md5_get_string_from_md5_digest (const unsigned char md5[16]) +trilobite_md5_get_string_from_md5_digest (const guchar md5[16]) { static char *str = NULL; int cnt; @@ -414,7 +414,7 @@ trilobite_md5_get_string_from_md5_digest (const unsigned char md5[16]) int main (int argc, char **argv) { - unsigned char digest[16]; + guchar digest[16]; int i; trilobite_md5_get_digest_from_file (argv[1], digest); diff --git a/components/services/trilobite/libtrilobite/trilobite-md5-tools.h b/components/services/trilobite/libtrilobite/trilobite-md5-tools.h index 31d6add2e..92e02bcc5 100644 --- a/components/services/trilobite/libtrilobite/trilobite-md5-tools.h +++ b/components/services/trilobite/libtrilobite/trilobite-md5-tools.h @@ -28,28 +28,21 @@ #include <glib.h> -/* FIXME: bugzilla.eazel.com 2851 - darins styleguide says not to use - evil glib types. Check if guchar is - "blacklisted" - http://cvs.gnome.org/lxr/source/nautilus/docs/style-guide.html -*/ typedef struct { guint32 buf[4]; guint32 bits[2]; - unsigned char in[64]; + guchar in[64]; int doByteReverse; } MD5Context ; -void trilobite_md5_get_digest (const char *buffer, int buffer_size, unsigned char digest[16]); -void trilobite_md5_get_digest_from_file (const char *filename, unsigned char digest[16]); +void trilobite_md5_get_digest (const char *buffer, int buffer_size, guchar digest[16]); +void trilobite_md5_get_digest_from_file (const char *filename, guchar digest[16]); /* Converts a 32 char hex'ified md5 to a 16 byte md5 digest */ -void trilobite_md5_get_digest_from_md5_string (const char *md5string, unsigned char pmd5[16]); +void trilobite_md5_get_digest_from_md5_string (const char *md5string, guchar pmd5[16]); /* Converts a 16 byte md5 digest to a 32 char hex'ified */ -const char *trilobite_md5_get_string_from_md5_digest (const unsigned char md5[16]); - -#endif /* TRILOBITE_MD5_TOOLS_H */ +const char *trilobite_md5_get_string_from_md5_digest (const guchar md5[16]); +#endif /* TRILOBITE_MD5_TOOLS_H */ diff --git a/docs/style-guide.html b/docs/style-guide.html index e58923f15..d0881c5ed 100644 --- a/docs/style-guide.html +++ b/docs/style-guide.html @@ -45,11 +45,12 @@ to avoid this. Also, we prefer to cast data pointers, rather than casting function pointers, since there's so much more to get wrong with function pointer casts.</p> -<p><b>We use typedefs from <glib.h> for things like guint and gpointer, +<p><b>We use typedefs from <glib.h> for things like guint, guchar and gpointer, but not gint, gchar, or gdouble.</b> Using these gives a false sense of portability. In all three cases, using system calls like printf requires knowing that these are the "real" int, char, and double, so there's no reason -to use a typedef that's non-standard.</p> +to use a typedef that's non-standard unless it's a shorter name or clearer +in some way.</p> <p><b>We avoid in-band signaling.</b> This means that we avoid using special values to indicate errors, for example. This can lead to subtle bugs when a valid diff --git a/libnautilus-extensions/nautilus-gdk-font-extensions.c b/libnautilus-extensions/nautilus-gdk-font-extensions.c index 283f22ecc..799b41c79 100644 --- a/libnautilus-extensions/nautilus-gdk-font-extensions.c +++ b/libnautilus-extensions/nautilus-gdk-font-extensions.c @@ -59,7 +59,7 @@ /* Font functions that could be public */ static NautilusStringList *nautilus_gdk_font_list_fonts (const char *pattern); -static char * nautilus_gdk_font_get_name (const GdkFont *font); +static char * nautilus_gdk_font_get_name (GdkFont *font); /* XLFD string operations */ static char * xlfd_string_get_nth (const char *xlfd_string, @@ -95,7 +95,7 @@ static int compare_xlfd_by_size_in_pixels (gconstpoint * if no bold font is found. */ GdkFont * -nautilus_gdk_font_get_bold (const GdkFont *font) +nautilus_gdk_font_get_bold (GdkFont *font) { char *name; char *weight_pattern; @@ -261,7 +261,7 @@ font_bitmap_get_by_size (const char *xlfd_string, * the first font equal or larger than the requested size. */ GdkFont * -nautilus_gdk_font_get_larger (const GdkFont *font, +nautilus_gdk_font_get_larger (GdkFont *font, int num_steps) { GdkFont *result = NULL; @@ -371,7 +371,7 @@ nautilus_gdk_font_get_larger (const GdkFont *font, * the first font equal or smaller than the requested size. */ GdkFont * -nautilus_gdk_font_get_smaller (const GdkFont *font, int num_steps) +nautilus_gdk_font_get_smaller (GdkFont *font, int num_steps) { g_return_val_if_fail (font != NULL, NULL); g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL); @@ -539,7 +539,7 @@ nautilus_gdk_font_list_fonts (const char *pattern) /* Return the font name - an xlfd string used by Gdk to allocate the font */ static char * -nautilus_gdk_font_get_name (const GdkFont *font) +nautilus_gdk_font_get_name (GdkFont *font) { GdkFontPrivate *font_private; const char *font_name; diff --git a/libnautilus-extensions/nautilus-gdk-font-extensions.h b/libnautilus-extensions/nautilus-gdk-font-extensions.h index b357b3f27..3035fafa4 100644 --- a/libnautilus-extensions/nautilus-gdk-font-extensions.h +++ b/libnautilus-extensions/nautilus-gdk-font-extensions.h @@ -30,18 +30,18 @@ #include <gdk/gdk.h> /* Misc GdkFont helper functions */ -gboolean nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, - GdkFont *font_b_null_allowed); -GdkFont *nautilus_get_largest_fitting_font (const char *text_to_format, - int width, - const char *font_format); -GdkFont *nautilus_gdk_font_get_bold (const GdkFont *plain); -GdkFont *nautilus_gdk_font_get_larger (const GdkFont *font, - int num_sizes); -GdkFont *nautilus_gdk_font_get_smaller (const GdkFont *font, - int num_sizes); -char * nautilus_string_ellipsize_start (const char *original, - GdkFont *font, - int length); +gboolean nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, + GdkFont *font_b_null_allowed); +GdkFont *nautilus_get_largest_fitting_font (const char *text_to_format, + int width, + const char *font_format); +GdkFont *nautilus_gdk_font_get_bold (GdkFont *plain); +GdkFont *nautilus_gdk_font_get_larger (GdkFont *font, + int num_sizes); +GdkFont *nautilus_gdk_font_get_smaller (GdkFont *font, + int num_sizes); +char * nautilus_string_ellipsize_start (const char *original, + GdkFont *font, + int length); #endif /* NAUTILUS_GDK_FONT_EXTENSIONS_H */ diff --git a/libnautilus-extensions/nautilus-string.c b/libnautilus-extensions/nautilus-string.c index 659bc47e5..f47cf6399 100644 --- a/libnautilus-extensions/nautilus-string.c +++ b/libnautilus-extensions/nautilus-string.c @@ -47,10 +47,10 @@ nautilus_strchr (const char *haystack, char needle) int nautilus_strcmp (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return strcmp (string_a == NULL ? "" : string_a, string_b == NULL ? "" : string_b); @@ -59,10 +59,10 @@ nautilus_strcmp (const char *string_a, const char *string_b) int nautilus_strcasecmp (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return g_strcasecmp (string_a == NULL ? "" : string_a, string_b == NULL ? "" : string_b); @@ -73,10 +73,10 @@ nautilus_strcmp_case_breaks_ties (const char *string_a, const char *string_b) { int casecmp_result; - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ casecmp_result = nautilus_strcasecmp (string_a, string_b); if (casecmp_result != 0) { @@ -91,10 +91,10 @@ nautilus_strcoll (const char *string_a, const char *string_b) const char *locale; int result; - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ locale = setlocale (LC_COLLATE, NULL); @@ -122,10 +122,10 @@ nautilus_str_is_empty (const char *string_or_null) gboolean nautilus_str_is_equal (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL != ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL != ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcmp (string_a, string_b) == 0; } @@ -133,10 +133,10 @@ nautilus_str_is_equal (const char *string_a, const char *string_b) gboolean nautilus_istr_is_equal (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL != ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL != ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcasecmp (string_a, string_b) == 0; } @@ -144,10 +144,10 @@ nautilus_istr_is_equal (const char *string_a, const char *string_b) int nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcmp ((const char *) string_a, (const char *) string_b); @@ -156,10 +156,10 @@ nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b) int nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcoll ((const char *) string_a, (const char *) string_b); @@ -168,10 +168,10 @@ nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b) int nautilus_strcasecmp_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcasecmp ((const char *) string_a, (const char *) string_b); diff --git a/libnautilus-private/nautilus-gdk-font-extensions.c b/libnautilus-private/nautilus-gdk-font-extensions.c index 283f22ecc..799b41c79 100644 --- a/libnautilus-private/nautilus-gdk-font-extensions.c +++ b/libnautilus-private/nautilus-gdk-font-extensions.c @@ -59,7 +59,7 @@ /* Font functions that could be public */ static NautilusStringList *nautilus_gdk_font_list_fonts (const char *pattern); -static char * nautilus_gdk_font_get_name (const GdkFont *font); +static char * nautilus_gdk_font_get_name (GdkFont *font); /* XLFD string operations */ static char * xlfd_string_get_nth (const char *xlfd_string, @@ -95,7 +95,7 @@ static int compare_xlfd_by_size_in_pixels (gconstpoint * if no bold font is found. */ GdkFont * -nautilus_gdk_font_get_bold (const GdkFont *font) +nautilus_gdk_font_get_bold (GdkFont *font) { char *name; char *weight_pattern; @@ -261,7 +261,7 @@ font_bitmap_get_by_size (const char *xlfd_string, * the first font equal or larger than the requested size. */ GdkFont * -nautilus_gdk_font_get_larger (const GdkFont *font, +nautilus_gdk_font_get_larger (GdkFont *font, int num_steps) { GdkFont *result = NULL; @@ -371,7 +371,7 @@ nautilus_gdk_font_get_larger (const GdkFont *font, * the first font equal or smaller than the requested size. */ GdkFont * -nautilus_gdk_font_get_smaller (const GdkFont *font, int num_steps) +nautilus_gdk_font_get_smaller (GdkFont *font, int num_steps) { g_return_val_if_fail (font != NULL, NULL); g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL); @@ -539,7 +539,7 @@ nautilus_gdk_font_list_fonts (const char *pattern) /* Return the font name - an xlfd string used by Gdk to allocate the font */ static char * -nautilus_gdk_font_get_name (const GdkFont *font) +nautilus_gdk_font_get_name (GdkFont *font) { GdkFontPrivate *font_private; const char *font_name; diff --git a/libnautilus-private/nautilus-gdk-font-extensions.h b/libnautilus-private/nautilus-gdk-font-extensions.h index b357b3f27..3035fafa4 100644 --- a/libnautilus-private/nautilus-gdk-font-extensions.h +++ b/libnautilus-private/nautilus-gdk-font-extensions.h @@ -30,18 +30,18 @@ #include <gdk/gdk.h> /* Misc GdkFont helper functions */ -gboolean nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, - GdkFont *font_b_null_allowed); -GdkFont *nautilus_get_largest_fitting_font (const char *text_to_format, - int width, - const char *font_format); -GdkFont *nautilus_gdk_font_get_bold (const GdkFont *plain); -GdkFont *nautilus_gdk_font_get_larger (const GdkFont *font, - int num_sizes); -GdkFont *nautilus_gdk_font_get_smaller (const GdkFont *font, - int num_sizes); -char * nautilus_string_ellipsize_start (const char *original, - GdkFont *font, - int length); +gboolean nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, + GdkFont *font_b_null_allowed); +GdkFont *nautilus_get_largest_fitting_font (const char *text_to_format, + int width, + const char *font_format); +GdkFont *nautilus_gdk_font_get_bold (GdkFont *plain); +GdkFont *nautilus_gdk_font_get_larger (GdkFont *font, + int num_sizes); +GdkFont *nautilus_gdk_font_get_smaller (GdkFont *font, + int num_sizes); +char * nautilus_string_ellipsize_start (const char *original, + GdkFont *font, + int length); #endif /* NAUTILUS_GDK_FONT_EXTENSIONS_H */ diff --git a/libnautilus-private/nautilus-string.c b/libnautilus-private/nautilus-string.c index 659bc47e5..f47cf6399 100644 --- a/libnautilus-private/nautilus-string.c +++ b/libnautilus-private/nautilus-string.c @@ -47,10 +47,10 @@ nautilus_strchr (const char *haystack, char needle) int nautilus_strcmp (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return strcmp (string_a == NULL ? "" : string_a, string_b == NULL ? "" : string_b); @@ -59,10 +59,10 @@ nautilus_strcmp (const char *string_a, const char *string_b) int nautilus_strcasecmp (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return g_strcasecmp (string_a == NULL ? "" : string_a, string_b == NULL ? "" : string_b); @@ -73,10 +73,10 @@ nautilus_strcmp_case_breaks_ties (const char *string_a, const char *string_b) { int casecmp_result; - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ casecmp_result = nautilus_strcasecmp (string_a, string_b); if (casecmp_result != 0) { @@ -91,10 +91,10 @@ nautilus_strcoll (const char *string_a, const char *string_b) const char *locale; int result; - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ locale = setlocale (LC_COLLATE, NULL); @@ -122,10 +122,10 @@ nautilus_str_is_empty (const char *string_or_null) gboolean nautilus_str_is_equal (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL != ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL != ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcmp (string_a, string_b) == 0; } @@ -133,10 +133,10 @@ nautilus_str_is_equal (const char *string_a, const char *string_b) gboolean nautilus_istr_is_equal (const char *string_a, const char *string_b) { - /* FIXME: Maybe we need to make this treat 'NULL != ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL != ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcasecmp (string_a, string_b) == 0; } @@ -144,10 +144,10 @@ nautilus_istr_is_equal (const char *string_a, const char *string_b) int nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcmp ((const char *) string_a, (const char *) string_b); @@ -156,10 +156,10 @@ nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b) int nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcoll ((const char *) string_a, (const char *) string_b); @@ -168,10 +168,10 @@ nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b) int nautilus_strcasecmp_compare_func (gconstpointer string_a, gconstpointer string_b) { - /* FIXME: Maybe we need to make this treat 'NULL < ""', or - * have a flavor that does that. If we didn't have code that - * already relies on 'NULL == ""', I would change it right - * now. + /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this + * treat 'NULL < ""', or have a flavor that does that. If we + * didn't have code that already relies on 'NULL == ""', I + * would change it right now. */ return nautilus_strcasecmp ((const char *) string_a, (const char *) string_b); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 6f5add07d..c295d0c01 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -573,13 +573,6 @@ open_location (FMDirectoryView *directory_view, switch (choice) { case RESPECT_PREFERENCE: if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, FALSE)) { - /* FIXME bugzilla.eazel.com 2464: This may be - * the desired behavior, but the preferences - * UI still says "open each item in a new - * window" and the preference name also says - * "ALWAYS_NEW". Can we resolve this - * inconsistency? - */ nautilus_view_open_location_prefer_existing_window (directory_view->details->nautilus_view, new_uri); } else { diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c index 1a8643f8d..183ef2805 100644 --- a/src/nautilus-first-time-druid.c +++ b/src/nautilus-first-time-druid.c @@ -287,7 +287,7 @@ make_anti_aliased_label (const char *text) label = nautilus_label_new (text); - /* FIXME bugzilla.eazel.com 5052: Hardcoded font and size. */ + /* FIXME bugzilla.eazel.com 3778: Hardcoded font and size. */ nautilus_label_set_font_from_components (NAUTILUS_LABEL (label), "helvetica", "medium", NULL, NULL); nautilus_label_set_font_size (NAUTILUS_LABEL (label), 12); nautilus_label_set_text_justification (NAUTILUS_LABEL (label), @@ -361,7 +361,7 @@ make_hbox_user_level_radio_button (int index, GtkWidget *radio_buttons[], label = make_anti_aliased_label (user_level_name); g_free (user_level_name); - /* FIXME bugzilla.eazel.com 5052: Hardcoded font. */ + /* FIXME bugzilla.eazel.com 3778: Hardcoded font. */ nautilus_label_set_font_from_components (NAUTILUS_LABEL (label), "helvetica", "bold", NULL, NULL); /* extra vbox to help with alignment */ @@ -414,7 +414,7 @@ set_up_user_level_page (NautilusDruidPageEazel *page) label = make_anti_aliased_label (_("User levels provide a way to adjust the software to your\n" "level of technical expertise. Pick an initial level that you\n" "feel comfortable with; you can always change it later.")); - /* FIXME bugzilla.eazel.com 5052: Hardcoded font size. */ + /* FIXME bugzilla.eazel.com 3778: Hardcoded font size. */ nautilus_label_set_font_size (NAUTILUS_LABEL (label), 12); gtk_widget_show (label); diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 3e65c3855..733085a09 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1770,11 +1770,15 @@ load_underway_callback (NautilusViewFrame *view, { g_assert (NAUTILUS_IS_WINDOW (window)); - /* We intentionally ignore progress from sidebar panels. Some - sidebar panels may get their own progress indicators - later. */ + /* FIXME bugzilla.eazel.com 2460: We intentionally ignore + * progress from sidebar panels. Some sidebar panels may get + * their own progress indicators later. + */ + + /* FIXME bugzilla.eazel.com 2461: Is progress from either old + * or new really equally interesting? + */ - /* FIXME bugzilla.eazel.com 2461: Is progress from either old or new really equally interesting? */ if (view == window->new_content_view || view == window->content_view) { change_state (window, LOAD_UNDERWAY, NULL, NULL); |