diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-08-24 15:37:31 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-08-24 15:37:31 +0000 |
| commit | c2619694fd2f94ad7da2d6e936494f4c16601212 (patch) | |
| tree | 8b10053e3ccfb1ff6cb3f4b428eed06694ca53e4 /indra/linux_updater | |
| parent | c3cbd049859c058526ae9a07a5cbfa7e51085943 (diff) | |
Some linux updater warning fixes for fussy futuristic gcc versions!
Diffstat (limited to 'indra/linux_updater')
| -rw-r--r-- | indra/linux_updater/linux_updater.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp index acc60d42bf..b93890ab32 100644 --- a/indra/linux_updater/linux_updater.cpp +++ b/indra/linux_updater/linux_updater.cpp @@ -258,7 +258,7 @@ void display_error(GtkWidget *parent, std::string title, std::string message) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - message.c_str()); + "%s", message.c_str()); gtk_window_set_title(GTK_WINDOW(dialog), title.c_str()); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -538,12 +538,12 @@ gboolean install_package(std::string package_file, std::string destination) char *package_file_string_copy = g_strdup(package_file.c_str()); char *tmp_dest_dir_string_copy = g_strdup(tmp_dest_dir.c_str()); - char *argv[8] = { + gchar *argv[8] = { tar_cmd, - "--strip", "1", - "-xjf", + const_cast<gchar*>("--strip"), const_cast<gchar*>("1"), + const_cast<gchar*>("-xjf"), package_file_string_copy, - "-C", tmp_dest_dir_string_copy, + const_cast<gchar*>("-C"), tmp_dest_dir_string_copy, NULL, }; |