diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 86 | ||||
| -rw-r--r-- | shell/main.c | 17 |
2 files changed, 9 insertions, 94 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d58a31168d..6138501f11 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,87 +1,7 @@ -2003-03-07 Not Zed <NotZed@Ximian.com> +2003-03-10 Ettore Perazzoli <ettore@ximian.com> - ** reverted the following patch from ettore, this is a gnome 2.2 - api change, and shouldn't be used yet. - - * e-shell.c (impl_finalize): Use - bonobo_activation_unregister_active_server() instead of - bonobo_activatino_active_server_unregister(). - (e_shell_construct): Use - bonobo_activation_register_active_server() instead of - bonobo_activation_active_server_register(). - -2003-03-04 Not Zed <NotZed@Ximian.com> - - * main.c (show_development_warning): Separated the current stable - version number from the warning prompt, and fixed a minor - grammatical error. For bug #38775. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-shell.c (impl_Shell_selectUserFolder): At least for now, - disable the nasty XWMHints trick to fool WMs; it is not needed now - that everything is in-proc. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-shell-utils.c (e_shell_folder_name_is_valid): Do not allow - names with a "#" in them either. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-shell-view.c (update_other_users_folder_items_sensitivity): - New function to toggle the "open other user's folder" menu item - sensitivity on or off depending on whether there are any storages - that actually support that. - (storage_set_removed_storage_callback): New callback for the - EStorageSet's "removed_storage" signal; it updates the sensitivity - if necessary. - (storage_set_new_storage_callback): Likewise, new callback for the - EStorageSet's "new_storage" signal. - (e_shell_view_construct): Connect these two signal callbacks here. - Also, call update_other_users_folder_items_sensitivity() to set up - the initial sensitivity of the menu item. - (update_for_current_uri): Add a missing EStorageSetView cast here. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - [#34371] - - * e-shell-shared-folder-picker-dialog.c - (folder_name_entry_changed_callback): New callback to set the - sensitivity of the OK button according to whether the folder name - entry is empty or not. - (show_dialog): Connect here. Pop up an error message if no user - is selected. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-shell.c (impl_finalize): Use - bonobo_activation_unregister_active_server() instead of - bonobo_activatino_active_server_unregister(). - (e_shell_construct): Use - bonobo_activation_register_active_server() instead of - bonobo_activation_active_server_register(). - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-shell-importer.c (IN): Use G_GNUC_FUNCTION instead of - __FUNCTION__. - (OUT): Likewise. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - Patch from Not Zed <NotZed@Ximian.com>: - - * main.c (show_development_warning): Separated the current stable - version number from the warning prompt, and fixed a minor - grammatical error. For bug #38775. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-config-upgrade.c (import_bonobo_config): Protect from val - being NULL when printf()ing -- should fix #39096 (Solaris-specific - crash). + * main.c (show_development_warning): Remove some bogus commas from + the message. 2003-03-05 Ettore Perazzoli <ettore@ximian.com> diff --git a/shell/main.c b/shell/main.c index e9e9718820..9118a8807c 100644 --- a/shell/main.c +++ b/shell/main.c @@ -196,7 +196,6 @@ show_development_warning (GtkWindow *parent) GtkWidget *dont_bother_me_again_checkbox; GtkWidget *alignment; GConfClient *client; - char *text; client = gconf_client_get_default (); @@ -210,28 +209,24 @@ show_development_warning (GtkWindow *parent) warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent, GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - text = g_strdup_printf( + label = gtk_label_new ( /* xgettext:no-c-format */ - /* Preview/Alpha/Beta version warning message */ _("Hi. Thanks for taking the time to download this preview release\n" "of the Ximian Evolution groupware suite.\n" "\n" - "This version of Ximian Evolution is not yet complete. It is getting close,\n" - "but some features are either unfinished or do not work properly.\n" + "This version of Ximian Evolution is not yet complete. It's getting close,\n" + "but some features are either unfinished or don't work properly.\n" "\n" "If you want a stable version of Evolution, we urge you to uninstall\n" - "this version, and install version %s instead.\n" + "this version and install a 1.2.x version instead (1.2.2)\n" "\n" "If you find bugs, please report them to us at bugzilla.ximian.com.\n" "This product comes with no warranty and is not intended for\n" "individuals prone to violent fits of anger.\n" "\n" "We hope that you enjoy the results of our hard work, and we\n" - "eagerly await your contributions!\n"), - "1.2.x (1.2.2)"); - label = gtk_label_new (text); - g_free(text); - + "eagerly await your contributions!\n" + )); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), |