diff options
Diffstat (limited to 'components/services')
24 files changed, 74 insertions, 74 deletions
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); } |