diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 193 | ||||
| -rw-r--r-- | shell/apps_evolution_shell.schemas.in.in | 14 | ||||
| -rw-r--r-- | shell/e-shell-window.c | 4 | ||||
| -rw-r--r-- | shell/e-sidebar.c | 6 | ||||
| -rw-r--r-- | shell/main.c | 73 |
5 files changed, 101 insertions, 189 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 790f20324a..e5a19c8017 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -6,40 +6,13 @@ * e-shell-window.c: (impl_dispose): Fix warnings at build-time, and clean up the connections to the D-Bus on exit (Closes: #332387) -2006-07-13 Srinivasa Ragavan <sragavan@novell.com> +2006-05-25 Srinivasa Ragavan <sragavan@novell.com> - ** Fix for bug #345331 + ** Fix for bug #341334 - * e-user-creatable-items-handler.c: (set_combo_button_style): Default - to both style. - -2006-07-12 Hiroyuki Ikezoe <poincare@ikezoe.net> - - ** Fixes bug #347182 - * e-user-creatable-items-handlers.c: - (set_combo_button_style): New function. - (new_button_change): Call set_combo_button_style. - (setup_toolbar_button): Call set_combo_button_style. - -2006-07-07 Li Yuan <li.yuan@sun.com> - - * e-shell-window.c: (setup_widgets): - Fix for #346613. - Fix the problem pointed out by Johnny <jjohnny@novell.com>. - When maximize Evolution, close and start Evolution sometimes, - the sidebar grows towards right. Set the view_notebook can be expanded - when the paned widget is resized. - -2006-07-05 Li Yuan <li.yuan@sun.com> - - * e-shell-window.c: (setup_widgets): - Fix for #346613. - Make the view_notebook cannot be resized shorter than its need. - -2006-06-21 Srinivasa Ragavan <sragavan@novell.com> - - * e-user-creatable-items-handler.c: (setup_toolbar_button): Fixed a - minor packing issue in New button. + * e-component-registry.c: (e_component_registry_peek_info): Check for + the presence of the fields before comparing. Exchange component wont + have these alias/etc. 2006-06-17 Tor Lillqvist <tml@novell.com> @@ -51,76 +24,28 @@ bonobo_activation_active_server_unregister() here, when the EShell Bonobo object is still fully active. -2006-06-19 Srinivasa Ragavan <sragavan@novell.com> - - ** Fixes bug #252814 - - * e-user-creatable-items-handler.c: (new_button_change), - (setup_toolbar_button), (e_user_creatable_items_handler_activate): - Read the toolbar setting and set the combo button. Patch from Oswald. - -2006-06-17 Andre Klapper <a9016009@gmx.de> - - * main.c: update last stable version number from 2.6.1 to 2.6.2 - -2006-05-25 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #341334 - - * e-component-registry.c: (e_component_registry_peek_info): Check for - the presence of the fields before comparing. Exchange component wont - have these alias/etc. - -2006-05-15 Li Yuan <li.yuan@sun.com> +2006-06-09 Li Yuan <li.yuan@sun.com> Fixes #341525 * e-sidebar.c: (button_toggled_callback): If the button has been selected, it is no need to emit the signal. -2006-04-30 Nancy Cai <nancy.cai@sun.com> - - Fixes #323853 - - * e-shell-importer.c: (filename_changed), (item_selected), - (importer_file_page_new), (prepare_file_page): - replacing GnomeFileEntry by GtkFileButton, which can import task files - with none UTF-8 filenames. - -2006-04-27 Andre Klapper <a9016009@gmx.de> - - * main.c: update last stable version number from 2.4.2.1 to 2.6.1 - -2006-04-24 Harish Krishnaswamy <kharish@novell.com> - - * main.c: (kill_dataserver): add eds-1.4 and eds-1.6 - to the list of old instances. - -2006-04-24 Harish Krishnaswamy <kharish@novell.com> - - * e-shell-window-commands.c: Update credits for - the previous development series. - -2006-04-06 Alejandro Andres <fuzzy.alej@gmail.com> - - * e-shell-view.c - * e-shell-window.c - - Fixes #337258. Now Evolution is shown at the end of the title bar. - -2006-04-21 Srinivasa Ragavan <sragavan@novell.com> - - ** Fixes bug #329731 - - * apps_evolution_shell.schemas.in.in: Added schema to maintain the - visibility of status bar. - 2006-04-18 Jeffrey Stedfast <fejj@novell.com> * e-shell-nm.c (e_shell_network_monitor): Intercept the Disconnected signal and setup a timeout to try and reconnect when the dbus daemon comes back up. +2006-03-13 Harish Krishnaswamy <kharish@novell.com> + + * main.c (kill_dataserver): add evolution-data-server-1.4 + to the list of old dataserver instances. + +2006-03-13 Harish Krishnaswamy <kharish@novell.com> + + * e-shell-window-commands.c: Update credits. + 2006-02-21 Tor Lillqvist <tml@novell.com> * main.c (main): On Win32, finally call link_shutdown() (from @@ -197,9 +122,10 @@ 2006-01-02 Harish Krishnaswamy <kharish@novell.com> - * e-shell-nm-glib.c (e_shell_nm_glib_initialise): Remove - suspicious and possibly redundant register/unregister calls. Fixes - #325364 (critical warning crasher). + * e-shell-nm-glib.c: (e_shell_nm_glib_initialise): + Remove suspicious and possibly redundant + register/unregister calls. Fixes #325364 (critical + warning crasher). 2005-12-30 Andre Klapper <a9016009@gmx.de> @@ -226,6 +152,7 @@ * shell.error.xml: fixed two dead links to "support.ximian.com" now to the (yet to come) FAQ at go-evolution.org. (#315866) + 2005-12-22 Parthasarathi Susarla <sparthasarathi@novell.com> * Evolution-Component.idl @@ -269,44 +196,44 @@ e_shell_go_online. 2005-12-21 Not Zed <NotZed@Ximian.com> - - * e-shell-view.c (impl_ShellView_setTitle): take a component id - argument. - - * e-shell-window.c (component_view_free): release the corba object - properly. - (e_shell_window_set_title): new helper to set the title for the - component. - (switch_view): use the component specific title if available or - fallback to the component name. - + + * e-shell-view.c (impl_ShellView_setTitle): take a component id + argument. + + * e-shell-window.c (component_view_free): release the corba object + properly. + (e_shell_window_set_title): new helper to set the title for the + component. + (switch_view): use the component specific title if available or + fallback to the component name. + 2004-12-21 Not Zed <NotZed@Ximian.com> - - ** See bug #60354. - - * Evolution-Component.idl: createControls -> createView and - ComponentView to keep track of things. - - * Evolution-Shell.idl: return a new type ShellView from - createNewWindow so other parts of the system can access it later. - ShellView so far just lets you set title or switch component, but - could be subclassed later. - - * e-shell.c (impl_Shell_createNewWindow): return a shell view. - - * e-shell-window.c (init_view): create the view from the compnent - first, then get the controls from it separately. - (init): setup the e-shell-view object for the create view - thing. - - * e-shell-view.c (e_shell_view_new): simple bonobo object for - Evolution_ShellView, keep track of the EShellWindow. - - * e-component-view.[ch]: simple bonobo object for - Evolution_ComponentView. Just keep track of the controls. + + ** See bug #60354. + + * Evolution-Component.idl: createControls -> createView and + ComponentView to keep track of things. + + * Evolution-Shell.idl: return a new type ShellView from + createNewWindow so other parts of the system can access it later. + ShellView so far just lets you set title or switch component, but + could be subclassed later. + + * e-shell.c (impl_Shell_createNewWindow): return a shell view. + + * e-shell-window.c (init_view): create the view from the compnent + first, then get the controls from it separately. + (init): setup the e-shell-view object for the create view + thing. + + * e-shell-view.c (e_shell_view_new): simple bonobo object for + Evolution_ShellView, keep track of the EShellWindow. + + * e-component-view.[ch]: simple bonobo object for + Evolution_ComponentView. Just keep track of the controls. Committed on behalf of NotZed - partha - + 2005-12-17 Tor Lillqvist <tml@novell.com> * e-config-upgrade.c: Use libedataserver's e_xml_parse_file() @@ -354,16 +281,16 @@ solves bug # 307780 - * e-shell-window.h: added the prototype for the function + * e-shell-window.h : added the prototype for the function e_shell_window_peek_statusbar(..); - - * e-shell-window.c: show/hide the status bar widget based on the saved + + * e-shell-window.c : show/hide the status bar widget based on the saved property. retreive the status bar's previous status and set in UI. define the function e_shell_window_peek_statusbar() which retrieves the status bar widget for e-shell-window-commands.c - - * e-shell-window-commands.c: view_statusbar_item_toggled_handler() + + * e-shell-window-commands.c : view_statusbar_item_toggled_handler() is the component listener for the "View Status Bar" menu item.it handles the click event in the menu item "View status Bar".The state of the status bar is also saved every time an event occurs diff --git a/shell/apps_evolution_shell.schemas.in.in b/shell/apps_evolution_shell.schemas.in.in index 1a0ea854f3..5e2ce825cf 100644 --- a/shell/apps_evolution_shell.schemas.in.in +++ b/shell/apps_evolution_shell.schemas.in.in @@ -165,19 +165,7 @@ <long>Whether the sidebar should be visible.</long> </locale> </schema> - - <schema> - <key>/schemas/apps/evolution/shell/view_defaults/statusbar_visible</key> - <applyto>/apps/evolution/shell/view_defaults/statusbar_visible</applyto> - <owner>evolution</owner> - <type>bool</type> - <default>TRUE</default> - <locale name="C"> - <short>Statusbar is visible</short> - <long>Whether the status bar should be visible.</long> - </locale> - </schema> - + <schema> <key>/schemas/apps/evolution/shell/view_defaults/component_id</key> <applyto>/apps/evolution/shell/view_defaults/component_id</applyto> diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index e5fc700ab0..d5c3a6ee5d 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -327,7 +327,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) } if (component_view->title == NULL) { - title = g_strdup_printf ("%s - Evolution", info->button_label); + title = g_strdup_printf ("Evolution - %s", info->button_label); gtk_window_set_title (GTK_WINDOW (window), title); g_free (title); } else @@ -670,7 +670,7 @@ setup_widgets (EShellWindow *window) priv->view_notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->view_notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->view_notebook), FALSE); - gtk_paned_pack2 (GTK_PANED (priv->paned), priv->view_notebook, TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (priv->paned), priv->view_notebook, TRUE, TRUE); gtk_widget_show (priv->view_notebook); gtk_paned_set_position (GTK_PANED (priv->paned), diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 32c25d748e..6c3499c98f 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -136,7 +136,7 @@ button_toggled_callback (GtkToggleButton *toggle_button, ESidebar *sidebar) { int id = 0; - gboolean is_active = FALSE; + gboolean is_actived = FALSE; GSList *p; if (sidebar->priv->in_toggle) @@ -145,7 +145,7 @@ button_toggled_callback (GtkToggleButton *toggle_button, sidebar->priv->in_toggle = TRUE; if (gtk_toggle_button_get_active (toggle_button)) - is_active = TRUE; + is_actived = TRUE; for (p = sidebar->priv->buttons; p != NULL; p = p->next) { Button *button = p->data; @@ -160,7 +160,7 @@ button_toggled_callback (GtkToggleButton *toggle_button, sidebar->priv->in_toggle = FALSE; - if (is_active) + if (is_actived) g_signal_emit (sidebar, signals[BUTTON_SELECTED], 0, id); } diff --git a/shell/main.c b/shell/main.c index ee86b45e58..6e22b85fd0 100644 --- a/shell/main.c +++ b/shell/main.c @@ -103,7 +103,6 @@ static gint idle_cb (void *data); static char *default_component_id = NULL; static char *evolution_debug_log = NULL; -static gchar **remaining_args; static void no_windows_left_cb (EShell *shell, gpointer data) @@ -131,7 +130,6 @@ kill_dataserver (void) system (KILL_PROCESS_CMD " -9 evolution-data-server-1.0 2> /dev/null"); system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null"); system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null"); system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null"); system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null"); @@ -245,7 +243,7 @@ show_development_warning(void) "\n" "We hope that you enjoy the results of our hard work, and we\n" "eagerly await your contributions!\n"), - "2.6.2"); + "2.4.2.1"); label = gtk_label_new (text); g_free(text); @@ -463,45 +461,44 @@ setup_segv_redirect (void) #define setup_segv_redirect() 0 #endif -static const GOptionEntry options[] = { - { "component", 'c', 0, G_OPTION_ARG_STRING, &default_component_id, - N_("Start Evolution activating the specified component"), NULL }, - { "offline", '\0', 0, G_OPTION_ARG_NONE, &start_offline, - N_("Start in offline mode"), NULL }, - { "online", '\0', 0, G_OPTION_ARG_NONE, &start_online, - N_("Start in online mode"), NULL }, -#ifdef KILL_PROCESS_CMD - { "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev, - N_("Forcibly shut down all Evolution components"), NULL }, -#endif -#if DEVELOPMENT - { "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, - N_("Forcibly re-migrate from Evolution 1.4"), NULL }, -#endif - { "debug", '\0', 0, G_OPTION_ARG_STRING, &evolution_debug_log, - N_("Send the debugging output of all components to a file."), NULL }, - { "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin, - N_("Disable loading of any plugins."), NULL }, - { "setup-only", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, - &setup_only, NULL, NULL }, - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, NULL, NULL }, - { NULL } -}; - int main (int argc, char **argv) { #ifdef G_OS_WIN32 extern void link_shutdown (void); #endif - + struct poptOption options[] = { + { "component", 'c', POPT_ARG_STRING, &default_component_id, 0, + N_("Start Evolution activating the specified component"), NULL }, + { "offline", '\0', POPT_ARG_NONE, &start_offline, 0, + N_("Start in offline mode"), NULL }, + { "online", '\0', POPT_ARG_NONE, &start_online, 0, + N_("Start in online mode"), NULL }, +#ifdef KILL_PROCESS_CMD + { "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, + N_("Forcibly shut down all Evolution components"), NULL }, +#endif +#if DEVELOPMENT + { "force-migrate", '\0', POPT_ARG_NONE, &force_migrate, 0, + N_("Forcibly re-migrate from Evolution 1.4"), NULL }, +#endif + { "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, + N_("Send the debugging output of all components to a file."), NULL }, + { "disable-eplugin", '\0', POPT_ARG_NONE, &disable_eplugin, 0, + N_("Disable loading of any plugins."), NULL }, + { "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, + &setup_only, 0, NULL, NULL }, + { NULL, '\0', 0, NULL, 0, NULL, NULL } + }; #if DEVELOPMENT GConfClient *client; gboolean skip_warning_dialog; #endif GSList *uri_list; + GValue popt_context_value = { 0, }; GnomeProgram *program; - GOptionContext *context; + poptContext popt_context; + const char **args; GList *icon_list; char *filename; @@ -512,13 +509,9 @@ main (int argc, char **argv) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - context = g_option_context_new (_("- The Evolution PIM and Email Client")); - - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PROGRAM_STANDARD_PROPERTIES, - GNOME_PARAM_GOPTION_CONTEXT, context, + GNOME_PARAM_POPT_TABLE, options, GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), NULL); @@ -578,14 +571,18 @@ main (int argc, char **argv) uri_list = NULL; - if (remaining_args != NULL) { + g_value_init (&popt_context_value, G_TYPE_POINTER); + g_object_get_property (G_OBJECT (program), GNOME_PARAM_POPT_CONTEXT, &popt_context_value); + popt_context = g_value_get_pointer (&popt_context_value); + args = poptGetArgs (popt_context); + if (args != NULL) { const char **p; - for (p = (const char**)remaining_args; *p != NULL; p++) + for (p = args; *p != NULL; p++) uri_list = g_slist_prepend (uri_list, (char *) *p); } uri_list = g_slist_reverse (uri_list); - + g_value_unset (&popt_context_value); gnome_sound_init ("localhost"); |