Commit b1943a3c authored by Darin Adler's avatar Darin Adler

Bonobo objects own themselves, so we should not do a ref/sink on them.

	* 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.

	* 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.

	* 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.
parent 0a11a08a
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
......
......@@ -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 ("&nbsp;");
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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 {
......
......@@ -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 ();
......
......@@ -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");
}
......
......@@ -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"));
}
}
......
......@@ -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 ();
......
......@@ -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 ();
......
......@@ -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 ();
......
......@@ -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"));
}
......
......@@ -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"));
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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 {
......
......@@ -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);