diff options
56 files changed, 267 insertions, 180 deletions
@@ -1,3 +1,106 @@ +2000-09-28 Darin Adler <darin@eazel.com> + + + * components/help/converters/gnome-db2html2/sect-elements.c: + (sect_entry_end_element): + * components/help/converters/gnome-db2html2/toc-elements.c: + (toc_title_start_element): + * components/image-viewer/nautilus-image-view.c: + (init_server_factory): + * components/rpmview/nautilus-rpm-view-install.c: + (nautilus_rpm_view_install_package_callback), + (nautilus_rpm_view_uninstall_package_callback): + * components/services/install/command-line/eazel-alt-install-corba. + c: (main): + * components/services/install/command-line/eazel-alt-install.c: + (main): + * components/services/install/command-line/eazel-install.c: + (generate_new_package_list), (fetch_remote_package_list), (main): + * components/services/install/command-line/eazel-package-query.c: + (main): + * components/services/install/command-line/eazel-revert.c: (main): + * components/services/install/command-line/eazel-uninstall.c: + (main): + * components/services/install/lib/eazel-install-object.c: + (eazel_install_fetch_remote_package_list): + * components/services/install/lib/eazel-install-protocols.c: + (eazel_install_fetch_file), (eazel_install_fetch_package): + * components/services/install/lib/eazel-install-rpm-glue.c: + (install_new_packages), (eazel_install_download_packages), + (uninstall_packages), (eazel_install_start_transaction), + (eazel_install_add_to_rpm_set), + (eazel_install_check_if_related_package): + * components/services/install/nautilus-view/nautilus-service-instal + l-view.c: (nautilus_service_install_preflight_check): + * components/services/install/nautilus-view/nautilus-service-instal + l.c: (nautilus_service_install_view_install_package_callback), + (nautilus_service_install_view_uninstall_package_callback): + * components/services/install/server/main.c: (main): + * components/services/summary/nautilus-view/nautilus-summary-view.c + : (generate_startup_form), (generate_summary_form), + (generate_service_entry_row): + * components/services/time/command-line/main.c: (main): + * components/services/time/service/main.c: (main): + * components/services/trilobite/libtrilobite/trilobite-core-utils.c + : (trilobite_init): + * components/services/trilobite/libtrilobite/trilobite-root-client. + c: (trilobite_root_client_initialize): + * components/services/trilobite/libtrilobite/trilobite-service-pass + wordquery.c: (trilobite_passwordquery_initialize): + * components/services/trilobite/libtrilobite/trilobite-service.c: + (trilobite_service_initialize): + * components/services/trilobite/sample/command-line/main.c: (main): + * components/services/trilobite/sample/service/main.c: (main): + * components/shell/shell.c: + * components/tree/nautilus-tree-model.c: + (nautilus_tree_model_monitor_add), + (nautilus_tree_model_root_node_file_monitor): + * components/tree/nautilus-tree-view.c: + * libnautilus-extensions/nautilus-directory-async.c: + (get_filter_options_for_directory_count): + * libnautilus-extensions/nautilus-file-utilities.c: + (nautilus_uri_is_local_scheme), (nautilus_handle_trailing_slashes): + * libnautilus-extensions/nautilus-icon-dnd.c: + (drag_data_received_callback): + * libnautilus-extensions/nautilus-icon-text-item.c: (iti_event): + * libnautilus-extensions/nautilus-list.c: + (nautilus_list_ensure_drag_data), (nautilus_list_get_drop_action), + (nautilus_list_drag_data_received): + * libnautilus-extensions/nautilus-scalable-font.c: + (initialize_global_stuff_if_needed): + * libnautilus-extensions/nautilus-undo-signal-handlers.c: + (editable_register_edit_undo): + * src/file-manager/fm-icon-view.c: + (context_menu_layout_radio_item_callback): + * src/file-manager/nautilus-indexing-info.c: + (update_progress_display): + * src/nautilus-switchable-search-bar.c: + (nautilus_switchable_search_bar_set_mode): + Got rid of all uses of == TRUE and != TRUE, since they are dangerous. + Got rid of all uses of == FALSE and != FALSE, since they lead to use + of == TRUE and != TRUE. + + * nautilus.spec.in: Added "-k" to build commands so we get more + information about what failed when failing to build via + RPM. Failures are still failures, we just see more of what's + failing. + + * libnautilus-extensions/nautilus-undo-context.c: + (nautilus_undo_context_new): Bonobo objects own themselves, so we + should not do a ref/sink on them. + * libnautilus-extensions/nautilus-undo-manager.c: + (nautilus_undo_manager_new): Bonobo objects own themselves, so we + should not do a ref/sink on them. + * src/nautilus-application.c: (nautilus_application_initialize): + Move global preferences initialization to main with other + initialize calls. + (nautilus_application_new): Bonobo objects own themselves, so we + should not do a ref/sink on them. + (nautilus_application_destroy): Unref the undo manager to fix a + leak. + * src/nautilus-main.c: (main): Move global preferences + initialization to main with other initialize calls. + 2000-09-28 John Sullivan <sullivan@eazel.com> * components/services/summary/nautilus-view/nautilus-summary-view.c diff --git a/components/help/converters/gnome-db2html2/sect-elements.c b/components/help/converters/gnome-db2html2/sect-elements.c index 9f443d1be..d8e534717 100644 --- a/components/help/converters/gnome-db2html2/sect-elements.c +++ b/components/help/converters/gnome-db2html2/sect-elements.c @@ -1764,7 +1764,7 @@ sect_entry_end_element (Context *context, return; } - if (context->empty_element == TRUE) { + if (context->empty_element) { /* We encoutnered an 'empty' element */ g_print (" "); } diff --git a/components/help/converters/gnome-db2html2/toc-elements.c b/components/help/converters/gnome-db2html2/toc-elements.c index 3263558de..5686ce979 100644 --- a/components/help/converters/gnome-db2html2/toc-elements.c +++ b/components/help/converters/gnome-db2html2/toc-elements.c @@ -462,7 +462,7 @@ toc_title_start_element (Context *context, || stack_el->info->index == CHAPTER || stack_el->info->index == PREFACE); - if (print_link == TRUE) { + if (print_link) { g_print ("<A href=\"gnome-help:%s", context->base_file); atrs_ptr = (stack_el->atrs); diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c index 3c7289db3..c050ea576 100644 --- a/components/image-viewer/nautilus-image-view.c +++ b/components/image-viewer/nautilus-image-view.c @@ -694,7 +694,7 @@ init_server_factory (int argc, char **argv) oaf_popt_options, 0, NULL); oaf_init (argc, argv); - if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) + if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) g_error (_("I could not initialize Bonobo")); CORBA_exception_free (&ev); diff --git a/components/rpmview/nautilus-rpm-view-install.c b/components/rpmview/nautilus-rpm-view-install.c index a48ff91dd..6a47434b1 100644 --- a/components/rpmview/nautilus-rpm-view-install.c +++ b/components/rpmview/nautilus-rpm-view-install.c @@ -371,7 +371,7 @@ nautilus_rpm_view_install_package_callback (GtkWidget *widget, EazelInstallCallback *cb; /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); return; } @@ -428,7 +428,7 @@ nautilus_rpm_view_uninstall_package_callback (GtkWidget *widget, EazelInstallCallback *cb; /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); return; } diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c index 07a0629bf..0da75c009 100644 --- a/components/services/install-view/nautilus-service-install-view.c +++ b/components/services/install-view/nautilus-service-install-view.c @@ -646,7 +646,7 @@ nautilus_service_install_preflight_check (EazelInstallCallback *cb, const GList gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); g_string_free (message, TRUE); - if (answer == FALSE) { + if (!answer) { view->details->cancelled = TRUE; return answer; } diff --git a/components/services/install-view/nautilus-service-install.c b/components/services/install-view/nautilus-service-install.c index ef9011ab4..b5e7a028d 100644 --- a/components/services/install-view/nautilus-service-install.c +++ b/components/services/install-view/nautilus-service-install.c @@ -179,14 +179,14 @@ nautilus_service_install_view_install_package_callback (GtkWidget *widget, } /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } cb = eazel_install_callback_new (); Trilobite_Eazel_Install__set_protocol (eazel_install_callback_corba_objref (cb), Trilobite_Eazel_PROTOCOL_HTTP, &ev); - if (check_for_root_user() == FALSE) { + if (!check_for_root_user()) { fprintf (stderr, "*** This tool requires root access, switching to test mode\n"); Trilobite_Eazel_Install__set_test_mode (eazel_install_callback_corba_objref (cb), TRUE, &ev); } else { @@ -233,14 +233,14 @@ nautilus_service_install_view_uninstall_package_callback (GtkWidget *widget, } /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } cb = eazel_install_callback_new (); Trilobite_Eazel_Install__set_protocol (eazel_install_callback_corba_objref (cb), Trilobite_Eazel_PROTOCOL_HTTP, &ev); - if (check_for_root_user() == FALSE) { + if (!check_for_root_user ()) { fprintf (stderr, "*** This tool requires root access, switching to test mode\n"); Trilobite_Eazel_Install__set_test_mode (eazel_install_callback_corba_objref (cb), TRUE, &ev); } else { diff --git a/components/services/install/command-line/eazel-alt-install-corba.c b/components/services/install/command-line/eazel-alt-install-corba.c index a2b765463..2b4d363e6 100644 --- a/components/services/install/command-line/eazel-alt-install-corba.c +++ b/components/services/install/command-line/eazel-alt-install-corba.c @@ -556,15 +556,15 @@ int main(int argc, char *argv[]) { g_message ("Using remote list "); } - /* Chech that we're root and on a redhat system */ - if (check_for_redhat () == FALSE) { + /* Check that we're root and on a redhat system */ + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); exit (1); } orb = oaf_init (argc, argv); - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); diff --git a/components/services/install/command-line/eazel-alt-install.c b/components/services/install/command-line/eazel-alt-install.c index 3a4312576..dd11f841b 100644 --- a/components/services/install/command-line/eazel-alt-install.c +++ b/components/services/install/command-line/eazel-alt-install.c @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) { oaf_init (argc, argv); - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); @@ -296,10 +296,10 @@ int main(int argc, char *argv[]) { } /* Chech that we're root and on a redhat system */ - if (check_for_root_user() == FALSE) { + if (!check_for_root_user()) { fprintf (stderr, "*** This tool requires root access.\n"); } - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } diff --git a/components/services/install/command-line/eazel-install.c b/components/services/install/command-line/eazel-install.c index eeaae3891..eafc7242f 100644 --- a/components/services/install/command-line/eazel-install.c +++ b/components/services/install/command-line/eazel-install.c @@ -108,7 +108,7 @@ generate_new_package_list (const char* popt_genpkg_file, retval = generate_xml_package_list (popt_genpkg_file, config_file); - if (retval == FALSE) { + if (!retval) { g_error (_("*** Could not generate xml package list! ***\n")); } @@ -144,7 +144,7 @@ fetch_remote_package_list (const char* pkg_list, TransferOptions* topts) { retval = http_fetch_remote_file (url, pkg_list); - if (retval == FALSE) { + if (!retval) { g_free (url); g_error ("*** Unable to retrieve package-list.xml! ***\n"); } @@ -261,16 +261,16 @@ main (int argc, char* argv[]) { poptFreeContext (pctx); retval = check_for_root_user (); - if (retval == FALSE) { + if (!retval) { g_error (_("*** You must run eazel-install as root! ***\n")); } retval = check_for_redhat (); - if (retval == FALSE) { + if (!retval) { g_error (_("*** eazel-install can only be used on RedHat! ***\n")); } - if ( DOWNGRADE_MODE == TRUE ) { + if ( DOWNGRADE_MODE ) { g_error (_("*** Downgrade Mode not supported yet! ***\n")); } @@ -283,31 +283,31 @@ main (int argc, char* argv[]) { generate_new_package_list (popt_genpkg_file, target_file); } - if ( LOGGING_MODE == TRUE ) { + if ( LOGGING_MODE ) { g_error (_("*** Logging not currently supported! ***\n")); exit (1); } - if ( USE_FTP == TRUE ) { + if ( USE_FTP ) { g_error (_("*** FTP installs are not currently supported! ***\n")); exit (1); } - else if (USE_HTTP == TRUE) { + else if (USE_HTTP) { iopts->protocol = PROTOCOL_HTTP; } else { iopts->protocol = PROTOCOL_LOCAL; } - if (VERBOSE_MODE == TRUE) { + if (VERBOSE_MODE) { iopts->mode_verbose = TRUE; } - if (TEST_MODE == TRUE) { + if (TEST_MODE) { iopts->mode_test = TRUE; } - if (FORCE_MODE == TRUE) { + if (FORCE_MODE) { iopts->mode_force = TRUE; } @@ -327,17 +327,17 @@ main (int argc, char* argv[]) { fetch_remote_package_list (iopts->pkg_list, topts); } - if (UNINSTALL_MODE == TRUE) { + if (UNINSTALL_MODE) { iopts->mode_uninstall = TRUE; retval = uninstall_packages (iopts, topts); - if (retval == FALSE) { + if (!retval) { g_error (_("*** The uninstall failed! ***\n")); } } else { retval = install_new_packages (iopts, topts); - if (retval == FALSE) { + if (!retval) { g_error (_("*** The install failed! ***\n")); } } diff --git a/components/services/install/command-line/eazel-package-query.c b/components/services/install/command-line/eazel-package-query.c index c3e074b80..86d3f3220 100644 --- a/components/services/install/command-line/eazel-package-query.c +++ b/components/services/install/command-line/eazel-package-query.c @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) { ctxt = gnomelib_parse_args (argc, argv, 0); #endif - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); diff --git a/components/services/install/command-line/eazel-revert.c b/components/services/install/command-line/eazel-revert.c index ebae8263d..73383e6f8 100644 --- a/components/services/install/command-line/eazel-revert.c +++ b/components/services/install/command-line/eazel-revert.c @@ -369,16 +369,16 @@ int main(int argc, char *argv[]) { } /* Chech that we're root and on a redhat system */ - if (check_for_root_user() == FALSE) { + if (!check_for_root_user()) { fprintf (stderr, "*** This tool requires root access.\n"); } - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } orb = oaf_init (argc, argv); - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); diff --git a/components/services/install/command-line/eazel-uninstall.c b/components/services/install/command-line/eazel-uninstall.c index 97df49b26..304ee3714 100644 --- a/components/services/install/command-line/eazel-uninstall.c +++ b/components/services/install/command-line/eazel-uninstall.c @@ -260,16 +260,16 @@ int main(int argc, char *argv[]) { } /* Chech that we're root and on a redhat system */ - if (check_for_root_user() == FALSE) { + if (!check_for_root_user()) { fprintf (stderr, "*** This tool requires root access.\n"); } - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } orb = oaf_init (argc, argv); - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); diff --git a/components/services/install/lib/eazel-install-object.c b/components/services/install/lib/eazel-install-object.c index b666b724b..92d7f081a 100644 --- a/components/services/install/lib/eazel-install-object.c +++ b/components/services/install/lib/eazel-install-object.c @@ -707,7 +707,7 @@ eazel_install_fetch_remote_package_list (EazelInstall *service) "package list", destination); - if (retval == FALSE) { + if (!retval) { g_warning (_("Unable to retrieve package-list.xml!\n")); } diff --git a/components/services/install/lib/eazel-install-protocols.c b/components/services/install/lib/eazel-install-protocols.c index 8b2cb5c83..f3bcff2f5 100644 --- a/components/services/install/lib/eazel-install-protocols.c +++ b/components/services/install/lib/eazel-install-protocols.c @@ -477,7 +477,7 @@ eazel_install_fetch_file (EazelInstall *service, } } - if (result==FALSE) { + if (!result) { g_warning (_("Failed to retreive %s!"), file_to_report ? file_to_report : g_basename (target_file)); eazel_install_emit_download_failed (service, @@ -551,7 +551,7 @@ eazel_install_fetch_package (EazelInstall *service, trilobite_debug ("cannot handle %s", url); } #endif /* EAZEL_INSTALL_PROTOCOL_USE_OLD_CGI */ - if (result==TRUE) { + if (result) { packagedata_fill_from_file (package, targetname); } else { g_warning (_("File download failed")); diff --git a/components/services/install/lib/eazel-install-rpm-glue.c b/components/services/install/lib/eazel-install-rpm-glue.c index a4ce1ba6c..67c104d7c 100644 --- a/components/services/install/lib/eazel-install-rpm-glue.c +++ b/components/services/install/lib/eazel-install-rpm-glue.c @@ -131,23 +131,23 @@ install_new_packages (EazelInstall *service, GList *categories) { interface_flags = 0; problem_filters = 0; - if (eazel_install_get_test (service) == TRUE) { + if (eazel_install_get_test (service)) { g_message (_("Dry Run Mode Activated. Packages will not actually be installed ...")); install_flags |= RPMTRANS_FLAG_TEST; } - if (eazel_install_get_update (service) == TRUE) { + if (eazel_install_get_update (service)) { interface_flags |= INSTALL_UPGRADE; } - if (eazel_install_get_verbose (service) == TRUE) { + if (eazel_install_get_verbose (service)) { rpmSetVerbosity (RPMMESS_VERBOSE); } else { rpmSetVerbosity (RPMMESS_NORMAL); } - if (eazel_install_get_force (service) == TRUE) { + if (eazel_install_get_force (service)) { problem_filters |= RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | @@ -206,7 +206,7 @@ eazel_install_download_packages (EazelInstall *service, g_assert (packages); g_assert (*packages); - for (iterator = *packages; (iterator != NULL) && (result == TRUE); iterator = g_list_next (iterator)) { + for (iterator = *packages; (iterator != NULL) && result; iterator = g_list_next (iterator)) { PackageData* package = (PackageData*)iterator->data; gboolean fetch_package; @@ -267,7 +267,7 @@ eazel_install_download_packages (EazelInstall *service, result = eazel_install_fetch_package (service, package); } - if (result == FALSE) { + if (!result) { remove_list = g_list_prepend (remove_list, package); } else { package->toplevel = toplevel; @@ -460,12 +460,12 @@ uninstall_packages (EazelInstall *service, interface_flags = 0; problem_filters = 0; - if (eazel_install_get_test (service) == TRUE) { + if (eazel_install_get_test (service)) { g_message (_("Dry Run Mode Activated. Packages will not actually be installed ...")); uninstall_flags |= RPMTRANS_FLAG_TEST; } - if (eazel_install_get_verbose (service) == TRUE) { + if (eazel_install_get_verbose (service)) { rpmSetVerbosity (RPMMESS_VERBOSE); } else { @@ -1028,7 +1028,7 @@ eazel_install_start_transaction (EazelInstall *service, res = 0; if (service->private->downloaded_files) { - if (eazel_install_do_transaction_md5_check (service, packages) == FALSE) { + if (!eazel_install_do_transaction_md5_check (service, packages)) { res = g_list_length (packages); } } @@ -1043,7 +1043,7 @@ eazel_install_start_transaction (EazelInstall *service, g_message (_("Preflight (%d bytes, %d packages)"), service->private->packsys.rpm.total_size, service->private->packsys.rpm.num_packages); - if (eazel_install_emit_preflight_check (service, packages) == FALSE) { + if (!eazel_install_emit_preflight_check (service, packages)) { trilobite_debug ("Operation aborted at user request"); res = g_list_length (packages); } @@ -1473,7 +1473,7 @@ eazel_install_add_to_rpm_set (EazelInstall *service, tmp_failed = NULL; - if (eazel_install_get_update (service) == TRUE) { + if (eazel_install_get_update (service)) { interface_flags |= INSTALL_UPGRADE; } @@ -1764,7 +1764,7 @@ eazel_install_check_if_related_package (EazelInstall *service, dep->name, dep->version, modpack->name, modpack->version, package->name, package->version); - if (result == FALSE) { + if (!result) { g_free (dep->version); dep->version = g_strdup (package->version); result = TRUE; 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 07a0629bf..0da75c009 100644 --- a/components/services/install/nautilus-view/nautilus-service-install-view.c +++ b/components/services/install/nautilus-view/nautilus-service-install-view.c @@ -646,7 +646,7 @@ nautilus_service_install_preflight_check (EazelInstallCallback *cb, const GList gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); g_string_free (message, TRUE); - if (answer == FALSE) { + if (!answer) { view->details->cancelled = TRUE; return answer; } diff --git a/components/services/install/nautilus-view/nautilus-service-install.c b/components/services/install/nautilus-view/nautilus-service-install.c index ef9011ab4..b5e7a028d 100644 --- a/components/services/install/nautilus-view/nautilus-service-install.c +++ b/components/services/install/nautilus-view/nautilus-service-install.c @@ -179,14 +179,14 @@ nautilus_service_install_view_install_package_callback (GtkWidget *widget, } /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } cb = eazel_install_callback_new (); Trilobite_Eazel_Install__set_protocol (eazel_install_callback_corba_objref (cb), Trilobite_Eazel_PROTOCOL_HTTP, &ev); - if (check_for_root_user() == FALSE) { + if (!check_for_root_user()) { fprintf (stderr, "*** This tool requires root access, switching to test mode\n"); Trilobite_Eazel_Install__set_test_mode (eazel_install_callback_corba_objref (cb), TRUE, &ev); } else { @@ -233,14 +233,14 @@ nautilus_service_install_view_uninstall_package_callback (GtkWidget *widget, } /* Check that we're on a redhat system */ - if (check_for_redhat () == FALSE) { + if (!check_for_redhat ()) { fprintf (stderr, "*** This tool can only be used on RedHat.\n"); } cb = eazel_install_callback_new (); Trilobite_Eazel_Install__set_protocol (eazel_install_callback_corba_objref (cb), Trilobite_Eazel_PROTOCOL_HTTP, &ev); - if (check_for_root_user() == FALSE) { + if (!check_for_root_user ()) { fprintf (stderr, "*** This tool requires root access, switching to test mode\n"); Trilobite_Eazel_Install__set_test_mode (eazel_install_callback_corba_objref (cb), TRUE, &ev); } else { diff --git a/components/services/install/server/main.c b/components/services/install/server/main.c index a65c33b00..c44e7e498 100644 --- a/components/services/install/server/main.c +++ b/components/services/install/server/main.c @@ -129,8 +129,8 @@ int main(int argc, char *argv[]) { g_datalist_init (&data); g_datalist_set_data (&data, "debug", (void *)1); - if (trilobite_init ("trilobite-eazel-install-service", "0.1", "/tmp/trilobite-install.log", - argc, argv, data) == FALSE) { + if (!trilobite_init ("trilobite-eazel-install-service", "0.1", "/tmp/trilobite-install.log", + argc, argv, data)) { g_error ("Could not initialize trilobite. :("); exit (1); } diff --git a/components/services/summary/nautilus-summary-view.c b/components/services/summary/nautilus-summary-view.c index 0754dd000..3330e5955 100644 --- a/components/services/summary/nautilus-summary-view.c +++ b/components/services/summary/nautilus-summary-view.c @@ -209,10 +209,10 @@ generate_startup_form (NautilusSummaryView *view) view->details->logged_in = am_i_logged_in (view); - if (view->details->logged_in == TRUE) { + if (view->details->logged_in) { /* fetch urls */ got_url_table = trilobite_redirect_fetch_table (URL_REDIRECT_TABLE_HOME_2); - if (got_url_table != TRUE) { + if (!got_url_table) { g_assert ("Could not get url table !\n"); } /* fetch and parse the xml file */ @@ -229,7 +229,7 @@ generate_startup_form (NautilusSummaryView *view) /* fetch urls */ got_url_table = trilobite_redirect_fetch_table (URL_REDIRECT_TABLE_HOME); - if (got_url_table != TRUE) { + if (!got_url_table) { g_error (_("Could not get url table !\n")); return; } @@ -373,7 +373,7 @@ generate_summary_form (NautilusSummaryView *view) nautilus_background_set_color (background, DEFAULT_SUMMARY_BACKGROUND_COLOR); */ /* setup the title */ - if (view->details->logged_in == FALSE) { + if (!view->details->logged_in) { title = create_services_title_widget ("You are not logged in!."); } else { @@ -463,7 +463,7 @@ generate_summary_form (NautilusSummaryView *view) gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0); gtk_widget_show (title); - if (view->details->logged_in == FALSE) { + if (!view->details->logged_in) { /* username label */ g_print ("label unl start\n"); temp_hbox = gtk_hbox_new (FALSE, 0); @@ -750,7 +750,7 @@ generate_service_entry_row (NautilusSummaryView *view, int row) cbdata->uri = view->details->services_redirects[view->details->current_service_row - 1]; gtk_signal_connect (GTK_OBJECT (view->details->services_goto_button), "clicked", GTK_SIGNAL_FUNC (goto_service_cb), cbdata); - if (view->details->services_button_enabled == FALSE) { + if (!view->details->services_button_enabled) { gtk_widget_set_sensitive (view->details->services_goto_button, FALSE); } diff --git a/components/services/summary/nautilus-view/nautilus-summary-view.c b/components/services/summary/nautilus-view/nautilus-summary-view.c index 0754dd000..3330e5955 100644 --- a/components/services/summary/nautilus-view/nautilus-summary-view.c +++ b/components/services/summary/nautilus-view/nautilus-summary-view.c @@ -209,10 +209,10 @@ generate_startup_form (NautilusSummaryView *view) view->details->logged_in = am_i_logged_in (view); - if (view->details->logged_in == TRUE) { + if (view->details->logged_in) { /* fetch urls */ got_url_table = trilobite_redirect_fetch_table (URL_REDIRECT_TABLE_HOME_2); - if (got_url_table != TRUE) { + if (!got_url_table) { g_assert ("Could not get url table !\n"); } /* fetch and parse the xml file */ @@ -229,7 +229,7 @@ generate_startup_form (NautilusSummaryView *view) /* fetch urls */ got_url_table = trilobite_redirect_fetch_table (URL_REDIRECT_TABLE_HOME); - if (got_url_table != TRUE) { + if (!got_url_table) { g_error (_("Could not get url table !\n")); return; } @@ -373,7 +373,7 @@ generate_summary_form (NautilusSummaryView *view) nautilus_background_set_color (background, DEFAULT_SUMMARY_BACKGROUND_COLOR); */ /* setup the title */ - if (view->details->logged_in == FALSE) { + if (!view->details->logged_in) { title = create_services_title_widget ("You are not logged in!."); } else { @@ -463,7 +463,7 @@ generate_summary_form (NautilusSummaryView *view) gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0); gtk_widget_show (title); - if (view->details->logged_in == FALSE) { + if (!view->details->logged_in) { /* username label */ g_print ("label unl start\n"); temp_hbox = gtk_hbox_new (FALSE, 0); @@ -750,7 +750,7 @@ generate_service_entry_row (NautilusSummaryView *view, int row) cbdata->uri = view->details->services_redirects[view->details->current_service_row - 1]; gtk_signal_connect (GTK_OBJECT (view->details->services_goto_button), "clicked", GTK_SIGNAL_FUNC (goto_service_cb), cbdata); - if (view->details->services_button_enabled == FALSE) { + if (!view->details->services_button_enabled) { gtk_widget_set_sensitive (view->details->services_goto_button, FALSE); } diff --git a/components/services/time/command-line/main.c b/components/services/time/command-line/main.c index 76be18cfb..07c09b923 100644 --- a/components/services/time/command-line/main.c +++ b/components/services/time/command-line/main.c @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) { gnome_init_with_popt_table ("trilobite-eazel-time-service-cli", "1.0",argc, argv, options, 0, NULL); orb = oaf_init (argc, argv); - if (bonobo_init (NULL, NULL, NULL) == FALSE) { + if (!bonobo_init (NULL, NULL, NULL)) { g_error ("Could not init bonobo"); } bonobo_activate (); diff --git a/components/services/time/service/main.c b/components/services/time/service/main.c index 0b7547e44..1f45c1f26 100644 --- a/components/services/time/service/main.c +++ b/components/services/time/service/main.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { gnome_init_with_popt_table ("trilobite-eazel-time-service-factory", "0.1", argc, argv, oaf_popt_options, 0, NULL); orb = oaf_init (argc, argv); - if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) { + if (!bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) { g_error ("Could not initialize Bonobo"); } diff --git a/components/services/trilobite/libtrilobite/trilobite-core-utils.c b/components/services/trilobite/libtrilobite/trilobite-core-utils.c index df5bf54ea..d49befa9b 100644 --- a/components/services/trilobite/libtrilobite/trilobite-core-utils.c +++ b/components/services/trilobite/libtrilobite/trilobite-core-utils.c @@ -438,7 +438,7 @@ trilobite_init (const char *service_name, const char *version_name, const char * gnome_init_with_popt_table (service_name, version_name, argc, argv, oaf_popt_options, 0, NULL); orb = oaf_init (argc, argv); - if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) { + if (!bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) { g_error (_("Could not initialize Bonobo")); goto fail; } diff --git a/components/services/trilobite/libtrilobite/trilobite-root-client.c b/components/services/trilobite/libtrilobite/trilobite-root-client.c index 361d0155c..cee409585 100644 --- a/components/services/trilobite/libtrilobite/trilobite-root-client.c +++ b/components/services/trilobite/libtrilobite/trilobite-root-client.c @@ -239,7 +239,7 @@ trilobite_root_client_initialize (TrilobiteRootClient *object) root_client = TRILOBITE_ROOT_CLIENT (object); corba_trilobite = trilobite_root_client_create_corba_object (BONOBO_OBJECT (object)); - if (trilobite_root_client_construct (object, corba_trilobite) == FALSE) { + if (!trilobite_root_client_construct (object, corba_trilobite)) { /* no good way to bail out now :( */ corba_trilobite = CORBA_OBJECT_NIL; } diff --git a/components/services/trilobite/libtrilobite/trilobite-service-passwordquery.c b/components/services/trilobite/libtrilobite/trilobite-service-passwordquery.c index 08aef4284..881aae2ff 100644 --- a/components/services/trilobite/libtrilobite/trilobite-service-passwordquery.c +++ b/components/services/trilobite/libtrilobite/trilobite-service-passwordquery.c @@ -230,7 +230,7 @@ trilobite_passwordquery_initialize (TrilobitePasswordQuery *trilobite) corba_trilobite = trilobite_passwordquery_create_corba_object (BONOBO_OBJECT (trilobite)); - if (trilobite_passwordquery_construct (trilobite, corba_trilobite) == FALSE) { + if (!trilobite_passwordquery_construct (trilobite, corba_trilobite)) { trilobite_passwordquery_destroy (GTK_OBJECT (trilobite)); trilobite = NULL; } diff --git a/components/services/trilobite/libtrilobite/trilobite-service.c b/components/services/trilobite/libtrilobite/trilobite-service.c index b1c0ebc08..fa2b20821 100644 --- a/components/services/trilobite/libtrilobite/trilobite-service.c +++ b/components/services/trilobite/libtrilobite/trilobite-service.c @@ -419,7 +419,7 @@ trilobite_service_initialize (TrilobiteService *trilobite) corba_trilobite = trilobite_service_create_corba_object (BONOBO_OBJECT (trilobite)); - if (trilobite_service_construct (trilobite, corba_trilobite) == FALSE) { + if (!trilobite_service_construct (trilobite, corba_trilobite)) { trilobite_service_destroy (GTK_OBJECT (trilobite)); trilobite = NULL; } diff --git a/components/services/trilobite/sample/command-line/main.c b/components/services/trilobite/sample/command-line/main.c index ed3f40af4..288946670 100644 --- a/components/services/trilobite/sample/command-line/main.c +++ b/components/services/trilobite/sample/command-line/main.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { TrilobiteRootClient *root_client = NULL; - if (trilobite_init ("trilobite-sample-client", "0.1", NULL, argc, argv, NULL) == FALSE) { + if (!trilobite_init ("trilobite-sample-client", "0.1", NULL, argc, argv, NULL)) { g_error ("Could not initialize trilobite. :("); exit (1); } diff --git a/components/services/trilobite/sample/service/main.c b/components/services/trilobite/sample/service/main.c index 57aa32245..ac367f75c 100644 --- a/components/services/trilobite/sample/service/main.c +++ b/components/services/trilobite/sample/service/main.c @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) { g_datalist_init (&data); g_datalist_set_data (&data, "debug", (void *)1); - if (trilobite_init ("trilobite-sample-service", "0.1", "/tmp/trilobite.log", argc, argv, data) == FALSE) { + if (!trilobite_init ("trilobite-sample-service", "0.1", "/tmp/trilobite.log", argc, argv, data)) { g_error ("Could not initialize trilobite. :("); exit (1); } diff --git a/components/shell/shell.c b/components/shell/shell.c index 15f1e03bc..a05788328 100644 --- a/components/shell/shell.c +++ b/components/shell/shell.c @@ -58,7 +58,7 @@ init_bonobo (int argc, char **argv) argc, argv, oaf_popt_options, 0, NULL); orb = oaf_init (argc, argv); - if (bonobo_init (orb, NULL, NULL) == FALSE) + if (!bonobo_init (orb, NULL, NULL)) g_error (_("Could not initialize Bonobo")); } diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c index 4f274b7fc..1dc4d9ef7 100644 --- a/components/tree/nautilus-tree-model.c +++ b/components/tree/nautilus-tree-model.c @@ -290,7 +290,7 @@ nautilus_tree_model_monitor_add (NautilusTreeModel *model, to monitor the root node itself. */ if (model->details->monitor_clients == NULL) { - if (model->details->root_node_reported == FALSE) { + if (!model->details->root_node_reported) { report_root_node_if_possible (model); } @@ -685,7 +685,7 @@ static void nautilus_tree_model_root_node_file_monitor (NautilusFile *file, NautilusTreeModel *model) { - if (model->details->root_node_reported == FALSE) { + if (!model->details->root_node_reported) { report_root_node_if_possible (model); } else { report_node_changed (model, diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index 45e9bfc79..177af5c5b 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -1539,7 +1539,7 @@ nautilus_tree_view_drag_motion (GtkWidget *widget, GdkDragContext *context, /* prelight depending on the type of drop. */ - if (drag_info->got_drop_data_type == TRUE) { + if (drag_info->got_drop_data_type) { switch (drag_info->data_type) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: case NAUTILUS_ICON_DND_URI_LIST: @@ -1619,7 +1619,7 @@ nautilus_tree_view_drag_data_received (GtkWidget *widget, dnd = tree_view->details->dnd; drag_info = dnd->drag_info; - if (drag_info->got_drop_data_type == FALSE) { + if (!drag_info->got_drop_data_type) { drag_info->data_type = info; drag_info->got_drop_data_type = TRUE; @@ -1639,7 +1639,7 @@ nautilus_tree_view_drag_data_received (GtkWidget *widget, /* we do not want to support any of the 3 above */ break; } - } else if (drag_info->drop_occured == TRUE) { + } else if (drag_info->drop_occured) { /* drop occured: do actual operations on the data */ switch (info) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: @@ -1842,8 +1842,8 @@ nautilus_tree_view_button_release (GtkWidget *widget, GdkEventButton *event) if (on_row == 1) { if (distance_squared <= RADIUS - && tree_view->details->dnd->pressed_hot_spot == TRUE - && is_still_hot_spot == TRUE) { + && tree_view->details->dnd->pressed_hot_spot + && is_still_hot_spot) { tree_view->details->dnd->pressed_hot_spot = FALSE; @@ -1879,7 +1879,7 @@ nautilus_tree_view_motion_notify (GtkWidget *widget, GdkEventButton *event) tree_view = NAUTILUS_TREE_VIEW (gtk_object_get_data (GTK_OBJECT (widget), "tree_view")); - if (tree_view->details->dnd->drag_pending == TRUE) { + if (tree_view->details->dnd->drag_pending) { int distance_squared; distance_squared = (event->x - tree_view->details->dnd->press_x) @@ -1949,7 +1949,7 @@ nautilus_tree_view_make_prelight_if_file_operation (NautilusTreeView *tree_view, } is_directory = nautilus_tree_view_is_tree_node_directory (NAUTILUS_TREE_VIEW (tree_view), node); - if (is_directory == FALSE) { + if (!is_directory) { NautilusTreeNode *parent_node, *current_node; current_node = view_node_to_model_node (tree_view, node); parent_node = nautilus_tree_node_get_parent (current_node); @@ -1989,7 +1989,7 @@ nautilus_tree_view_expand_node (NautilusCTree *tree, NautilusCTreeNode *node) &node_spacing, &pixmap_closed, &mask_closed, &pixmap_opened, &mask_opened, &is_leaf, &is_expanded); - if (is_expanded == FALSE) { + if (!is_expanded) { /* expand */ nautilus_ctree_expand (NAUTILUS_CTREE(tree), node); @@ -2017,7 +2017,7 @@ nautilus_tree_view_collapse_node (NautilusCTree *tree, NautilusCTreeNode *node) &node_spacing, &pixmap_closed, &mask_closed, &pixmap_opened, &mask_opened, &is_leaf, &is_expanded); - if (is_expanded == TRUE) { + if (is_expanded) { /* collapse */ nautilus_ctree_collapse (NAUTILUS_CTREE(tree), node); @@ -2065,7 +2065,7 @@ nautilus_tree_view_expand_or_collapse_row (NautilusCTree *tree, int row) &node_spacing, &pixmap_closed, &mask_closed, &pixmap_opened, &mask_opened, &is_leaf, &is_expanded); - if (is_expanded == FALSE) { + if (!is_expanded) { /* expand */ nautilus_ctree_expand (NAUTILUS_CTREE(tree), node); @@ -2123,7 +2123,7 @@ nautilus_tree_view_find_drop_target (NautilusTreeView *tree_view, current_node = view_node_to_model_node (tree_view, node); - if (is_directory == FALSE) { + if (!is_directory) { NautilusTreeNode *parent_node; parent_node = nautilus_tree_node_get_parent (current_node); file = nautilus_tree_node_get_file (parent_node); @@ -2225,7 +2225,7 @@ nautilus_tree_view_ensure_drag_data (NautilusTreeView *tree_view, drag_info = tree_view->details->dnd->drag_info; - if (drag_info->got_drop_data_type == FALSE) { + if (!drag_info->got_drop_data_type) { gtk_drag_get_data (GTK_WIDGET (tree_view->details->tree), context, GPOINTER_TO_INT (context->targets->data), time); @@ -2310,7 +2310,7 @@ expand_time_callback (gpointer data) expand_hack = (NautilusTreeViewExpandHack *) data; - if (expand_hack->is_valid == TRUE) { + if (expand_hack->is_valid) { NautilusCTreeNode *current_node; gboolean was_expanded; @@ -2323,7 +2323,7 @@ expand_time_callback (gpointer data) } was_expanded = nautilus_tree_view_expand_node (NAUTILUS_CTREE (expand_hack->ctree), current_node); - if (was_expanded == FALSE) { + if (!was_expanded) { GSList *list; list = expand_hack->tree_view->details->dnd->expanded_nodes; expand_hack->tree_view->details->dnd->expanded_nodes = @@ -2366,7 +2366,7 @@ nautilus_tree_view_expand_maybe_later (NautilusTreeView *tree_view, is_expanded = nautilus_tree_view_is_tree_node_expanded (NAUTILUS_CTREE (tree_view->details->tree), current_node); /* try to expand */ - if (is_directory == TRUE && is_expanded == FALSE) { + if (is_directory && !is_expanded) { int squared_distance; squared_distance = (abs(x - expand_hack->org_x)) + (abs(y - expand_hack->org_y)); @@ -2524,7 +2524,7 @@ nautilus_tree_view_get_drop_action (NautilusTreeView *tree_view, /* FIXME bugzilla.eazel.com 2569: Too much code copied from nautilus-icon-dnd.c. Need to share more. */ - if (drag_info->got_drop_data_type == FALSE) { + if (!drag_info->got_drop_data_type) { /* drag_data_received didn't get called yet */ return; } @@ -2575,8 +2575,8 @@ nautilus_tree_view_collapse_all (NautilusTreeView *tree_view, for (temp_list = list; temp_list != NULL; temp_list = temp_list->next) { NautilusCTreeNode *expanded_node; expanded_node = (NautilusCTreeNode *) temp_list->data; - if (nautilus_ctree_is_ancestor (NAUTILUS_CTREE (tree_view->details->tree), - expanded_node, current_node) == FALSE) { + if (!nautilus_ctree_is_ancestor (NAUTILUS_CTREE (tree_view->details->tree), + expanded_node, current_node)) { #if 0 { char *expanded_uri, *current_uri; diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index 75b014d5a..a250c58f9 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -1851,10 +1851,10 @@ get_filter_options_for_directory_count (NautilusFile *file) filter_options = GNOME_VFS_DIRECTORY_FILTER_NOSELFDIR | GNOME_VFS_DIRECTORY_FILTER_NOPARENTDIR; - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, FALSE) == FALSE) { + if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, FALSE)) { filter_options |= GNOME_VFS_DIRECTORY_FILTER_NODOTFILES; } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, FALSE) == FALSE) { + if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, FALSE)) { filter_options |= GNOME_VFS_DIRECTORY_FILTER_NOBACKUPFILES; } diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c index 299d915f2..27afd7d5e 100644 --- a/libnautilus-extensions/nautilus-file-utilities.c +++ b/libnautilus-extensions/nautilus-file-utilities.c @@ -181,7 +181,7 @@ nautilus_uri_is_local_scheme (const char *uri) is_local_scheme = FALSE; for (temp_scheme = *local_schemes, i = 0; temp_scheme != NULL; i++, temp_scheme = local_schemes[i]) { is_local_scheme = nautilus_istr_has_prefix (uri, temp_scheme); - if (is_local_scheme == TRUE) { + if (is_local_scheme) { break; } } @@ -211,9 +211,9 @@ nautilus_handle_trailing_slashes (const char *uri) /* remove multiple trailing slashes */ for (temp = uri_copy; *temp != '\0'; temp++) { - if (*temp == '/' && previous_char_is_column == FALSE) { + if (*temp == '/' && !previous_char_is_column) { previous_chars_are_slashes_without_column = TRUE; - } else if (*temp == '/' && previous_char_is_column == TRUE) { + } else if (*temp == '/' && previous_char_is_column) { previous_chars_are_slashes_without_column = FALSE; previous_char_is_column = TRUE; previous_chars_are_slashes_with_column = TRUE; @@ -228,8 +228,8 @@ nautilus_handle_trailing_slashes (const char *uri) } } - if (*temp == '\0' && previous_chars_are_slashes_without_column == TRUE) { - if (is_local_scheme == TRUE) { + if (*temp == '\0' && previous_chars_are_slashes_without_column) { + if (is_local_scheme) { /* go back till you remove them all. */ for (temp--; *(temp) == '/'; temp--) { *temp = '\0'; @@ -242,7 +242,7 @@ nautilus_handle_trailing_slashes (const char *uri) } } - if (*temp == '\0' && previous_chars_are_slashes_with_column == TRUE) { + if (*temp == '\0' && previous_chars_are_slashes_with_column) { /* go back till you remove them all but three. */ for (temp--; *(temp - 3) != ':' && *(temp - 2) != ':' && *(temp - 1) != ':'; temp--) { *temp = '\0'; diff --git a/libnautilus-extensions/nautilus-icon-dnd.c b/libnautilus-extensions/nautilus-icon-dnd.c index 1447402b9..11f8d4c96 100644 --- a/libnautilus-extensions/nautilus-icon-dnd.c +++ b/libnautilus-extensions/nautilus-icon-dnd.c @@ -406,7 +406,7 @@ drag_data_received_callback (GtkWidget *widget, /* this is the second use case of this callback. * we have to do the actual work for the drop. */ - if (drag_info->drop_occured == TRUE) { + if (drag_info->drop_occured) { switch (info) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: diff --git a/libnautilus-extensions/nautilus-icon-text-item.c b/libnautilus-extensions/nautilus-icon-text-item.c index 90adb1aab..d661cbf29 100644 --- a/libnautilus-extensions/nautilus-icon-text-item.c +++ b/libnautilus-extensions/nautilus-icon-text-item.c @@ -1036,8 +1036,9 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event) return TRUE; case GDK_FOCUS_CHANGE: - if (iti->editing && event->focus_change.in == FALSE) + if (iti->editing && !event->focus_change.in) { iti_edition_accept (iti); + } return TRUE; diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c index 373d8d566..26c7ac934 100644 --- a/libnautilus-extensions/nautilus-list.c +++ b/libnautilus-extensions/nautilus-list.c @@ -2748,7 +2748,7 @@ nautilus_list_ensure_drag_data (NautilusList *list, guint32 time) { - if (list->details->drag_info->got_drop_data_type == FALSE) { + if (!list->details->drag_info->got_drop_data_type) { gtk_drag_get_data (GTK_WIDGET (list), context, GPOINTER_TO_INT (context->targets->data), time); @@ -2840,7 +2840,7 @@ nautilus_list_get_drop_action (NautilusList *list, /* FIXME bugzilla.eazel.com 2569: Too much code copied from nautilus-icon-dnd.c. Need to share more. */ - if (drag_info->got_drop_data_type == FALSE) { + if (!drag_info->got_drop_data_type) { /* drag_data_received didn't get called yet */ return; } @@ -3073,7 +3073,7 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context, break; } - if (drag_info->drop_occured == TRUE) { + if (drag_info->drop_occured) { switch (info) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: diff --git a/libnautilus-extensions/nautilus-scalable-font.c b/libnautilus-extensions/nautilus-scalable-font.c index 5e7bf3d99..2930abdb6 100644 --- a/libnautilus-extensions/nautilus-scalable-font.c +++ b/libnautilus-extensions/nautilus-scalable-font.c @@ -1390,7 +1390,7 @@ initialize_global_stuff_if_needed (void) } /* Initialize the global font table */ - if (fonts_initialized == FALSE) { + if (!fonts_initialized) { fonts_initialized = TRUE; global_font_family_table = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/libnautilus-extensions/nautilus-undo-context.c b/libnautilus-extensions/nautilus-undo-context.c index 0d5482688..077304fbc 100644 --- a/libnautilus-extensions/nautilus-undo-context.c +++ b/libnautilus-extensions/nautilus-undo-context.c @@ -124,9 +124,6 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) CORBA_exception_free (&ev); - gtk_object_ref (GTK_OBJECT (context)); - gtk_object_sink (GTK_OBJECT (context)); - return context; } diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c index d543e8a78..cd656443f 100644 --- a/libnautilus-extensions/nautilus-undo-manager.c +++ b/libnautilus-extensions/nautilus-undo-manager.c @@ -231,13 +231,7 @@ corba_undo (PortableServer_Servant servant, NautilusUndoManager * nautilus_undo_manager_new (void) { - NautilusUndoManager *manager; - - manager = NAUTILUS_UNDO_MANAGER (gtk_object_new (nautilus_undo_manager_get_type (), NULL)); - gtk_object_ref (GTK_OBJECT (manager)); - gtk_object_sink (GTK_OBJECT (manager)); - - return manager; + return NAUTILUS_UNDO_MANAGER (gtk_object_new (nautilus_undo_manager_get_type (), NULL)); } static void diff --git a/libnautilus-extensions/nautilus-undo-signal-handlers.c b/libnautilus-extensions/nautilus-undo-signal-handlers.c index 9884138cb..1af3b1c82 100644 --- a/libnautilus-extensions/nautilus-undo-signal-handlers.c +++ b/libnautilus-extensions/nautilus-undo-signal-handlers.c @@ -157,7 +157,7 @@ editable_register_edit_undo (GtkEditable *editable) } undo_info = (EditableUndoObjectData *)data; - if (undo_info->undo_registered == TRUE) { + if (undo_info->undo_registered) { return; } diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 75b014d5a..a250c58f9 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -1851,10 +1851,10 @@ get_filter_options_for_directory_count (NautilusFile *file) filter_options = GNOME_VFS_DIRECTORY_FILTER_NOSELFDIR | GNOME_VFS_DIRECTORY_FILTER_NOPARENTDIR; - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, FALSE) == FALSE) { + if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, FALSE)) { filter_options |= GNOME_VFS_DIRECTORY_FILTER_NODOTFILES; } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, FALSE) == FALSE) { + if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, FALSE)) { filter_options |= GNOME_VFS_DIRECTORY_FILTER_NOBACKUPFILES; } diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 299d915f2..27afd7d5e 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -181,7 +181,7 @@ nautilus_uri_is_local_scheme (const char *uri) is_local_scheme = FALSE; for (temp_scheme = *local_schemes, i = 0; temp_scheme != NULL; i++, temp_scheme = local_schemes[i]) { is_local_scheme = nautilus_istr_has_prefix (uri, temp_scheme); - if (is_local_scheme == TRUE) { + if (is_local_scheme) { break; } } @@ -211,9 +211,9 @@ nautilus_handle_trailing_slashes (const char *uri) /* remove multiple trailing slashes */ for (temp = uri_copy; *temp != '\0'; temp++) { - if (*temp == '/' && previous_char_is_column == FALSE) { + if (*temp == '/' && !previous_char_is_column) { previous_chars_are_slashes_without_column = TRUE; - } else if (*temp == '/' && previous_char_is_column == TRUE) { + } else if (*temp == '/' && previous_char_is_column) { previous_chars_are_slashes_without_column = FALSE; previous_char_is_column = TRUE; previous_chars_are_slashes_with_column = TRUE; @@ -228,8 +228,8 @@ nautilus_handle_trailing_slashes (const char *uri) } } - if (*temp == '\0' && previous_chars_are_slashes_without_column == TRUE) { - if (is_local_scheme == TRUE) { + if (*temp == '\0' && previous_chars_are_slashes_without_column) { + if (is_local_scheme) { /* go back till you remove them all. */ for (temp--; *(temp) == '/'; temp--) { *temp = '\0'; @@ -242,7 +242,7 @@ nautilus_handle_trailing_slashes (const char *uri) } } - if (*temp == '\0' && previous_chars_are_slashes_with_column == TRUE) { + if (*temp == '\0' && previous_chars_are_slashes_with_column) { /* go back till you remove them all but three. */ for (temp--; *(temp - 3) != ':' && *(temp - 2) != ':' && *(temp - 1) != ':'; temp--) { *temp = '\0'; diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 1447402b9..11f8d4c96 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -406,7 +406,7 @@ drag_data_received_callback (GtkWidget *widget, /* this is the second use case of this callback. * we have to do the actual work for the drop. */ - if (drag_info->drop_occured == TRUE) { + if (drag_info->drop_occured) { switch (info) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c index 90adb1aab..d661cbf29 100644 --- a/libnautilus-private/nautilus-icon-text-item.c +++ b/libnautilus-private/nautilus-icon-text-item.c @@ -1036,8 +1036,9 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event) return TRUE; case GDK_FOCUS_CHANGE: - if (iti->editing && event->focus_change.in == FALSE) + if (iti->editing && !event->focus_change.in) { iti_edition_accept (iti); + } return TRUE; diff --git a/libnautilus-private/nautilus-list.c b/libnautilus-private/nautilus-list.c index 373d8d566..26c7ac934 100644 --- a/libnautilus-private/nautilus-list.c +++ b/libnautilus-private/nautilus-list.c @@ -2748,7 +2748,7 @@ nautilus_list_ensure_drag_data (NautilusList *list, guint32 time) { - if (list->details->drag_info->got_drop_data_type == FALSE) { + if (!list->details->drag_info->got_drop_data_type) { gtk_drag_get_data (GTK_WIDGET (list), context, GPOINTER_TO_INT (context->targets->data), time); @@ -2840,7 +2840,7 @@ nautilus_list_get_drop_action (NautilusList *list, /* FIXME bugzilla.eazel.com 2569: Too much code copied from nautilus-icon-dnd.c. Need to share more. */ - if (drag_info->got_drop_data_type == FALSE) { + if (!drag_info->got_drop_data_type) { /* drag_data_received didn't get called yet */ return; } @@ -3073,7 +3073,7 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context, break; } - if (drag_info->drop_occured == TRUE) { + if (drag_info->drop_occured) { switch (info) { case NAUTILUS_ICON_DND_GNOME_ICON_LIST: diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c index 5e7bf3d99..2930abdb6 100644 --- a/libnautilus-private/nautilus-scalable-font.c +++ b/libnautilus-private/nautilus-scalable-font.c @@ -1390,7 +1390,7 @@ initialize_global_stuff_if_needed (void) } /* Initialize the global font table */ - if (fonts_initialized == FALSE) { + if (!fonts_initialized) { fonts_initialized = TRUE; global_font_family_table = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c index 0d5482688..077304fbc 100644 --- a/libnautilus-private/nautilus-undo-context.c +++ b/libnautilus-private/nautilus-undo-context.c @@ -124,9 +124,6 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) CORBA_exception_free (&ev); - gtk_object_ref (GTK_OBJECT (context)); - gtk_object_sink (GTK_OBJECT (context)); - return context; } diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index d543e8a78..cd656443f 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/nautilus-undo-manager.c @@ -231,13 +231,7 @@ corba_undo (PortableServer_Servant servant, NautilusUndoManager * nautilus_undo_manager_new (void) { - NautilusUndoManager *manager; - - manager = NAUTILUS_UNDO_MANAGER (gtk_object_new (nautilus_undo_manager_get_type (), NULL)); - gtk_object_ref (GTK_OBJECT (manager)); - gtk_object_sink (GTK_OBJECT (manager)); - - return manager; + return NAUTILUS_UNDO_MANAGER (gtk_object_new (nautilus_undo_manager_get_type (), NULL)); } static void diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c index 9884138cb..1af3b1c82 100644 --- a/libnautilus-private/nautilus-undo-signal-handlers.c +++ b/libnautilus-private/nautilus-undo-signal-handlers.c @@ -157,7 +157,7 @@ editable_register_edit_undo (GtkEditable *editable) } undo_info = (EditableUndoObjectData *)data; - if (undo_info->undo_registered == TRUE) { + if (undo_info->undo_registered) { return; } diff --git a/nautilus.spec.in b/nautilus.spec.in index 993b47963..9777275c9 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -1,4 +1,4 @@ -# Note this is NOT a relocatable thing :) +# Note that this is NOT a relocatable package %define name nautilus %define ver @VERSION@ %define RELEASE prw2 @@ -55,7 +55,7 @@ files to allow you to develop nautilus components. %build %ifarch alpha - MYARCH_FLAGS="--host=alpha-redhat-linux" + MYARCH_FLAGS="--host=alpha-redhat-linux" %endif LC_ALL="" @@ -71,17 +71,15 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure $MYARCH_FLAGS --prefix=%{prefix} \ --sysconfdir=%{sysconfdir} if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make + (make "MAKE=make -k -j $SMP"; exit 0) + make else - make + make -k fi %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install - +make -k prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install for FILE in "$RPM_BUILD_ROOT/bin/*"; do file "$FILE" | grep -q not\ stripped && strip $FILE done @@ -91,11 +89,10 @@ done %post if ! grep %{prefix}/lib /etc/ld.so.conf > /dev/null ; then - echo "%{prefix}/lib" >> /etc/ld.so.conf + echo "%{prefix}/lib" >> /etc/ld.so.conf fi - /sbin/ldconfig - + %postun -p /sbin/ldconfig %files diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 070d859da..ecbb75669 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -500,7 +500,7 @@ context_menu_layout_radio_item_callback (GtkWidget *menu_item, gpointer user_dat icon_view = FM_ICON_VIEW (user_data); /* FIXME bugzilla.eazel.com 916: Workaround for Bonobo/GTK menu bug. */ - if (icon_view->details->updating_toggle_menu_item == TRUE) { + if (icon_view->details->updating_toggle_menu_item) { return; } diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c index 77b8e93e5..220c7dcad 100644 --- a/src/file-manager/nautilus-indexing-info.c +++ b/src/file-manager/nautilus-indexing-info.c @@ -68,9 +68,11 @@ update_progress_display (gpointer data) if (dialog == NULL) { return 0; } + /* This shouldn't ever happen, but it is possible, so we'll - not whine if it does */ - if (NAUTILUS_IS_LABEL (progress_change_data->progress_label) == FALSE) { + * not whine if it does. + */ + if (!NAUTILUS_IS_LABEL (progress_change_data->progress_label)) { return 0; } diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 45f4e16b1..050afd276 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -39,7 +39,6 @@ #include "nautilus-main.h" #include <bonobo.h> #include <libnautilus-extensions/nautilus-file-utilities.h> -#include <libnautilus-extensions/nautilus-global-preferences.h> #include <libnautilus-extensions/nautilus-gtk-macros.h> #include <libnautilus-extensions/nautilus-icon-factory.h> #include <libnautilus-extensions/nautilus-stock-dialogs.h> @@ -166,15 +165,9 @@ nautilus_application_initialize (NautilusApplication *application) g_error ("could not create factory"); } CORBA_exception_free (&ev); - + bonobo_object_construct (BONOBO_OBJECT (application), corba_object); - - /* Initialize preferences. This is needed so that proper - * defaults are available before any preference peeking - * happens. - */ - nautilus_global_preferences_initialize (); - + /* Create an undo manager */ application->undo_manager = nautilus_undo_manager_new (); } @@ -182,19 +175,20 @@ nautilus_application_initialize (NautilusApplication *application) NautilusApplication * nautilus_application_new (void) { - NautilusApplication *application; - - application = NAUTILUS_APPLICATION (gtk_object_new (nautilus_application_get_type (), NULL)); - gtk_object_ref (GTK_OBJECT (application)); - gtk_object_sink (GTK_OBJECT (application)); - return application; + return NAUTILUS_APPLICATION (gtk_object_new (nautilus_application_get_type (), NULL)); } static void nautilus_application_destroy (GtkObject *object) { + NautilusApplication *application; + + application = NAUTILUS_APPLICATION (object); + nautilus_bookmarks_exiting (); + bonobo_object_unref (BONOBO_OBJECT (application->undo_manager)); + NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 1948ec2bd..655614361 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -43,6 +43,7 @@ #include <libnautilus-extensions/nautilus-lib-self-check-functions.h> #include <libnautilus-extensions/nautilus-self-checks.h> #include <libnautilus-extensions/nautilus-glib-extensions.h> +#include <libnautilus-extensions/nautilus-global-preferences.h> #include <liboaf/liboaf.h> #include <gtk/gtkmain.h> #include <parser.h> @@ -212,6 +213,12 @@ main (int argc, char *argv[]) bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); bonobo_activate (); /* do now since we need it before main loop */ + /* Initialize preferences. This is needed so that proper + * defaults are available before any preference peeking + * happens. + */ + nautilus_global_preferences_initialize (); + /* Do either the self-check or the real work. */ if (perform_self_check) { #ifndef NAUTILUS_OMIT_SELF_CHECK diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c index 0523d9d6e..2008b050d 100644 --- a/src/nautilus-switchable-search-bar.c +++ b/src/nautilus-switchable-search-bar.c @@ -194,7 +194,7 @@ nautilus_switchable_search_bar_set_mode (NautilusSwitchableSearchBar *bar, /* Ignore requests for impossible modes for now */ location = nautilus_navigation_bar_get_location (NAUTILUS_NAVIGATION_BAR (bar)); - if (nautilus_search_uri_is_displayable_by_mode (location, mode) == FALSE) { + if (!nautilus_search_uri_is_displayable_by_mode (location, mode)) { g_free (location); return; } |