diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-10 21:09:59 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-13 03:33:43 +0800 |
commit | d09d8de870b6697c8a8b262e7e077b871a69b315 (patch) | |
tree | 3b718882e7a0bb0a996daf2967a033d91714c9b5 /shell/e-shell-window.c | |
parent | b61331ed03ac1c7a9b8614e25510040b9c60ae02 (diff) | |
download | gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.gz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.bz2 gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.lz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.xz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.zst gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.zip |
Consolidate base utility libraries into libeutil.
Evolution consists of entirely too many small utility libraries, which
increases linking and loading time, places a burden on higher layers of
the application (e.g. modules) which has to remember to link to all the
small in-tree utility libraries, and makes it difficult to generate API
documentation for these utility libraries in one Gtk-Doc module.
Merge the following utility libraries under the umbrella of libeutil,
and enforce a single-include policy on libeutil so we can reorganize
the files as desired without disrupting its pseudo-public API.
libemail-utils/libemail-utils.la
libevolution-utils/libevolution-utils.la
filter/libfilter.la
widgets/e-timezone-dialog/libetimezonedialog.la
widgets/menus/libmenus.la
widgets/misc/libemiscwidgets.la
widgets/table/libetable.la
widgets/text/libetext.la
This also merges libedataserverui from the Evolution-Data-Server module,
since Evolution is its only consumer nowadays, and I'd like to make some
improvements to those APIs without concern for backward-compatibility.
And finally, start a Gtk-Doc module for libeutil. It's going to be a
project just getting all the symbols _listed_ much less _documented_.
But the skeletal structure is in place and I'm off to a good start.
Diffstat (limited to 'shell/e-shell-window.c')
-rw-r--r-- | shell/e-shell-window.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 2202757bb1..3e9be0f845 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -1576,59 +1576,59 @@ e_shell_window_set_toolbar_visible (EShellWindow *shell_window, } /** - * e_shell_window_set_toolbar_new_prefer_item: + * e_shell_window_get_toolbar_new_prefer_item: * @shell_window: an #EShellWindow - * @prefer_item: prefer-item name to be set * - * Sets prefer item on the New button for current view. + * Returns: name of preferred item on the New button for current view. * * Since: 3.4 **/ -void -e_shell_window_set_toolbar_new_prefer_item (EShellWindow *shell_window, - const gchar *prefer_item) +const gchar * +e_shell_window_get_toolbar_new_prefer_item (EShellWindow *shell_window) { GtkWidget *toolbar; GtkToolItem *item; - g_return_if_fail (shell_window != NULL); - g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + g_return_val_if_fail (shell_window != NULL, NULL); + g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL); toolbar = e_shell_window_get_managed_widget (shell_window, "/main-toolbar"); - g_return_if_fail (toolbar != NULL); + g_return_val_if_fail (toolbar != NULL, NULL); item = gtk_toolbar_get_nth_item (GTK_TOOLBAR (toolbar), 0); - g_return_if_fail (item != NULL); - g_return_if_fail (E_IS_MENU_TOOL_BUTTON (item)); + g_return_val_if_fail (item != NULL, NULL); + g_return_val_if_fail (E_IS_MENU_TOOL_BUTTON (item), NULL); - e_menu_tool_button_set_prefer_item (E_MENU_TOOL_BUTTON (item), prefer_item); + return e_menu_tool_button_get_prefer_item (E_MENU_TOOL_BUTTON (item)); } /** - * e_shell_window_get_toolbar_new_prefer_item: + * e_shell_window_set_toolbar_new_prefer_item: * @shell_window: an #EShellWindow + * @prefer_item: prefer-item name to be set * - * Returns: name of preferred item on the New button for current view. + * Sets prefer item on the New button for current view. * * Since: 3.4 **/ -const gchar * -e_shell_window_get_toolbar_new_prefer_item (EShellWindow *shell_window) +void +e_shell_window_set_toolbar_new_prefer_item (EShellWindow *shell_window, + const gchar *prefer_item) { GtkWidget *toolbar; GtkToolItem *item; - g_return_val_if_fail (shell_window != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL); + g_return_if_fail (shell_window != NULL); + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); toolbar = e_shell_window_get_managed_widget (shell_window, "/main-toolbar"); - g_return_val_if_fail (toolbar != NULL, NULL); + g_return_if_fail (toolbar != NULL); item = gtk_toolbar_get_nth_item (GTK_TOOLBAR (toolbar), 0); - g_return_val_if_fail (item != NULL, NULL); - g_return_val_if_fail (E_IS_MENU_TOOL_BUTTON (item), NULL); + g_return_if_fail (item != NULL); + g_return_if_fail (E_IS_MENU_TOOL_BUTTON (item)); - return e_menu_tool_button_get_prefer_item (E_MENU_TOOL_BUTTON (item)); + e_menu_tool_button_set_prefer_item (E_MENU_TOOL_BUTTON (item), prefer_item); } /** |