callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to new UI handler

Browse Source 
2000-10-20  Michael Meeks  <michael@helixcode.com>

	* evolution-shell-component-client.c
	(evolution_shell_component_client_populate_folder_context_menu),
	(evolution_shell_component_client_create_view): update to new UI handler

	* e-shell-view-menu.c (command_create_folder): ditto.

	* e-storage-set-view.c (popup_folder_menu): ditto.

	* evolution-shell-component-client.h: kill ui-compat include.

svn path=/trunk/; revision=6082
This commit is contained in:
Michael Meeks
2000-10-20 21:07:26 +00:00
committed by Michael Meeks
parent e2e21e3f76
commit 910b29b7d9
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/ChangeLog
View File

@ -1,3 +1,15 @@
2000-10-20 Michael Meeks <michael@helixcode.com>
* evolution-shell-component-client.c
(evolution_shell_component_client_populate_folder_context_menu),
(evolution_shell_component_client_create_view): update to new UI handler
* e-shell-view-menu.c (command_create_folder): ditto.
* e-storage-set-view.c (popup_folder_menu): ditto.
* evolution-shell-component-client.h: kill ui-compat include.
2000-10-19 Iain Holmes <iain@helixcode.com>
*e-shell-view.c (e_shell_view_save_settings): If there is no view

16
shell/e-shell-view-menu.c
View File

@ -80,7 +80,7 @@ folder_bar_mode_changed_cb (EShellView *shell_view,
/* Command callbacks. */
static void
command_quit (BonoboUIHandler *uih,
command_quit (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -94,7 +94,7 @@ command_quit (BonoboUIHandler *uih,
}
static void
command_run_bugbuddy (BonoboUIHandler *uih,
command_run_bugbuddy (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -128,7 +128,7 @@ zero_pointer(GtkObject *object, void **pointer)
}
static void
command_about_box (BonoboUIHandler *uih,
command_about_box (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -179,7 +179,7 @@ command_about_box (BonoboUIHandler *uih,
}
static void
command_help (BonoboUIHandler *uih,
command_help (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -244,7 +244,7 @@ command_toggle_shortcut_bar (BonoboUIComponent *component,
static void
command_new_folder (BonoboUIHandler *uih,
command_new_folder (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -267,7 +267,7 @@ command_new_folder (BonoboUIHandler *uih,
}
static void
command_new_view (BonoboUIHandler *uih,
command_new_view (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -314,7 +314,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
}
static void
command_goto_folder (BonoboUIHandler *uih,
command_goto_folder (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -344,7 +344,7 @@ command_goto_folder (BonoboUIHandler *uih,
}
static void
command_create_folder (BonoboUIHandler *uih,
command_create_folder (BonoboUIComponent *uih,
void *data,
const char *path)
{

2
shell/e-shell-view-menu.h
View File

@ -26,8 +26,6 @@
#ifndef E_SHELL_VIEW_MENU_H
#define E_SHELL_VIEW_MENU_H
#include <bonobo/bonobo-ui-compat.h>
#include "e-shell-view.h"
void e_shell_view_menu_setup (EShellView *shell_view);

6
shell/e-storage-set-view.c
View File

@ -201,7 +201,7 @@ get_pixbuf_for_folder (EStorageSetView *storage_set_view,
#if 0
static void
folder_context_menu_activate_cb (BonoboUIHandler *uih,
folder_context_menu_activate_cb (BonoboUIComponent *uih,
void *data,
const char *path)
{
@ -217,7 +217,7 @@ folder_context_menu_activate_cb (BonoboUIHandler *uih,
static void
populate_folder_context_menu_with_common_items (EStorageSetView *storage_set_view,
BonoboUIHandler *uih)
BonoboUIComponent *uih)
{
bonobo_ui_handler_menu_new_item (uih, "/Activate",
_("_View"), _("View the selected folder"),
@ -236,7 +236,7 @@ popup_folder_menu (EStorageSetView *storage_set_view,
EvolutionShellComponentClient *handler;
EStorageSetViewPrivate *priv;
EFolderTypeRegistry *folder_type_registry;
BonoboUIHandler *uih;
BonoboUIComponent *uih;
EFolder *folder;
priv = storage_set_view->priv;

6
shell/evolution-shell-component-client.c
View File

@ -398,7 +398,7 @@ evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *she
EvolutionShellComponentResult
evolution_shell_component_client_create_view (EvolutionShellComponentClient *shell_component_client,
BonoboUIHandler *uih,
BonoboUIComponent *uih,
const char *physical_uri,
const char *type_string,
BonoboControl **control_return)
@ -411,7 +411,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she
RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
RETURN_ERROR_IF_FAIL (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client));
RETURN_ERROR_IF_FAIL (uih != NULL);
RETURN_ERROR_IF_FAIL (BONOBO_IS_UI_HANDLER (uih));
RETURN_ERROR_IF_FAIL (BONOBO_IS_UI_COMPONENT (uih));
RETURN_ERROR_IF_FAIL (physical_uri != NULL);
RETURN_ERROR_IF_FAIL (type_string != NULL);
RETURN_ERROR_IF_FAIL (control_return != NULL);
@ -493,7 +493,7 @@ evolution_shell_component_client_async_remove_folder (EvolutionShellComponentCli
void
evolution_shell_component_client_populate_folder_context_menu (EvolutionShellComponentClient *shell_component_client,
BonoboUIHandler *uih,
BonoboUIComponent *uih,
const char *physical_uri,
const char *type)
{

5
shell/evolution-shell-component-client.h
View File

@ -25,7 +25,6 @@
#define EVOLUTION_SHELL_COMPONENT_CLIENT_H
#include <bonobo/bonobo-object-client.h>
#include <bonobo/bonobo-ui-compat.h>
#include "evolution-shell-component.h"
@ -73,7 +72,7 @@ EvolutionShellComponentResult evolution_shell_component_client_set_owner (Ev
EvolutionShellComponentResult evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *shell_component_client,
Evolution_Shell shell);
EvolutionShellComponentResult evolution_shell_component_client_create_view (EvolutionShellComponentClient *shell_component_client,
BonoboUIHandler *uih,
BonoboUIComponent *uih,
const char *physical_uri,
const char *type_string,
BonoboControl **control_return);
@ -90,7 +89,7 @@ void evolution_shell_component_client_async_remove_folder (EvolutionShellCompo
void *data);
void evolution_shell_component_client_populate_folder_context_menu (EvolutionShellComponentClient *shell_component_client,
BonoboUIHandler *uih,
BonoboUIComponent *uih,
const char *physical_uri,
const char *type);

1
shell/evolution-shell-component.h
View File

@ -30,7 +30,6 @@
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-ui-compat.h>
#include "Evolution.h"