callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
482cf3700a1d1df629cc5d8c09a2f2490b3fcd77
evolution/shell/evolution-wizard.c
Ettore Perazzoli 482cf3700a [With this commit, the shell compiles without deprecated 
GLib/GTK+ functions, except for a couple of places were we use
GtkCList.]

* Makefile.am (INCLUDES): Add `-DG_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED'.

* evolution-test-component.c (create_new_folder_selector): No
gtk_window_set_policy().

* main.c (quit_box_new): gtk_window_set_resizable() instead of
gtk_window_set_policy().
(view_map_callback): g_signal_handlers_disconnect_by_func()
instead of gtk_signal_disconnect_by_func().
(main): No need to push the GdkRGB visual/cmap anymore.
(new_view_created_callback): Likewise.

* e-task-widget.c: Renamed member pixmap of ETaskWidgetPrivate to
`image'.
(init): Updated accordingly.
(e_task_widget_construct): Use GtkImage, not GtkPixmap.

* e-storage.c (class_init): Converted from gtk_signal_new() to
g_signal_new().

* e-storage-set.c (class_init): Converted from gtk_signal_new() to
g_signal_new().

* e-storage-set-view.c
(setup_folder_properties_items_if_corba_storage_clicked):
g_string_append_printf() instead of g_string_sprintfa().
(class_init): Converted from gtk_signal_new() to g_signal_new().
(setup_folder_changed_callbacks): Use
e_signal_connect_while_alive() and
e_signal_connect_full_while_alive().

* e-splash.c (e_splash_construct): gtk_window_set_resizable()
instead of gtk_window_set_policy().

* e-shortcuts.c: Do not #include e-unicode.h.
(shortcut_item_update): Use g_path_get_basename() instead of
g_basename().
(e_shortcuts_add_default_shortcuts): No need to de-utfize strings.
(e_shortcuts_add_default_group): Same here.

* e-shortcuts-view.c: Do not #include <e-unicode.h>.
(class_init): Converted from gtk_signal_new() to g_signal_new().
(destroy_group_cb): No need to convert the text from UTF8.

* e-shell.c (impl_dispose): g_signal_handlers_disconnect_by_func()
instead of gtk_signal_disconnect_by_func().
(class_init): Use g_signal_new() instead of gtk_signal_new().

* e-shell-view.c: Do not #include e-unicode.h.  Renamed member
offline_toggle_pixmap to offline_toggle_image in
EShellViewPrivate.
(update_folder_title_bar): No need to de-UTF8-ize the title.
(cleanup_delayed_selection):
g_signal_handlers_disconnect_by_func() instead of
gtk_signal_disconnect_by_func().
(ui_engine_add_hint_callback): gtk_label_set_text(), not
gtk_label_set().
(class_init): Use g_signal_new() instead of gtk_signal_new().
(update_for_current_uri): No need to convert the title from UTF8.
(setup_offline_toggle): Changed to set up a GtkImage, not a
GtkPixmap.
(update_offline_toggle_status): Accordingly (gtk_image* instead of
gtk_pixmap*).
(set_current_notebook_page): gtk_notebook_set_current_page(), not
gtk_notebook_set_page().
(get_storage_set_path_from_uri): g_ascii_strncasecmp() instead of
g_strncasecmp().
(folder_bar_popup_map_callback): Use
e_signal_connect_while_alive() instead of
gtk_signal_connect_while_alive().
(e_shell_view_construct): Likewise.
(display_uri): g_signal_connect_after() instead of
gtk_signal_connect_full().
(update_for_current_uri):
g_signal_handlers_{block,unblock}_by_func() instead of
gtk_signal_handler_{block,unblock}_by_func().

* e-shell-view-menu.c (command_about_box):
gtk_window_set_resizable() instead of gtk_window_set_policy().

* e-shell-utils.c (get_mini_name): g_path_get_basename() instead
of g_basename().

* e-shell-user-creatable-items-handler.c
(append_xml_for_menu_item): g_string_append_printf() instead of
g_string_sprintfa().
(create_menu_xml): Likewise.

* e-shell-shared-folder-picker-dialog.c: Do not #include
e-unicode.h.
(progress_bar_timeout_callback): Expect a GtkProgressBar data and
just use gtk_progress_bar_pulse().
(create_progress_dialog): gtk_window_set_resizable() instead of
gtk_window_set_policy().  No gtk_progress_set_activity_mode().
(setup_server_option_menu): Just use
gtk_menu_item_new_with_label() instead of
e_utf8_gtk_menu_item_new_with_label().

* e-shell-settings-dialog.c (set_dialog_size): Ported to Pango.

* e-shell-offline-sync.c
(impl_SyncFolderProgressListener_updateProgress):
gtk_progress_set_fraction() instead of
gtk_progress_bar_set_percentage().
(sync_folder): Likewise.
(setup_dialog): gtk_window_set_resizable() instead of
gtk_window_set_policy().
(sync_folder): No gtk_progress_set_activity_mode().

* e-shell-offline-handler.c: #undef {G,GTK}_DISABLE_DEPRECATED
here for now (need to port from GtkCList).
(class_init): Use g_signal_new()

* e-shell-importer.c: #undef {G,GTK}_DISABLE_DEPRECATED here for
now (need to port from GtkCList).

* e-shell-folder-title-bar.c (create_image_widget_from_xpm):
Renamed from create_pixmap_widget_from_xpm(); handle GtkImage
instead of GtkPixmap.
(new_empty_image_widget): Renamed from new_empty_pixmap_widget();
return a GtkImage instead of a GtkPixmap.
(add_navigation_buttons): Updated accordingly; so use GtkImages
instead of GtkPixmaps.
(e_shell_folder_title_bar_construct): Likewise.
(e_shell_folder_title_bar_set_icon): Use gtk_image_* instead of
gtk_pixmap_* on the image widgets.
(class_init): Converted to use g_signal_new() instead of
gtk_signal_new().
(e_shell_folder_title_bar_new): No need for pushing the GdkRGB
visual/cmap anymore.

* e-shell-folder-selection-dialog.c (check_folder_type_valid):
Just use strcmp instead of strcasecmp().
(class_init): g_signal_new() instead of gtk_signal_new().
(e_shell_folder_selection_dialog_construct): Removed call to
gtk_window_set_policy().

* e-shell-folder-creation-dialog.c
(type_with_display_name_compare_func): Changed to use
g_utf8_casefold().

* e-shell-folder-commands.c: Do not #include e-unicode.h.
(e_shell_command_rename_folder): g_path_get_dirname() instead of
g_dirname().
(folder_selection_dialog_folder_selected_callback):
g_path_get_basename() instead of g_basename().
(rename_cb): Likewise.
(delete_dialog): Do not convert from UTF8 for display purposes.
(e_shell_command_rename_folder): Likewise.

* e-shell-about-box.c (timeout_callback): Ported to Pango and use
gdk_window_invalidate_rect() instead of gtk_widget_draw().

* e-setup.c (check_evolution_directory): Use
gtk_window_set_resizable() instead of gtk_window_set_policy().

* e-local-storage.c: Do not include e-unicode.h.
(create_folder): Use g_path_get_basename() instead of
g_basename().
(create_folder_directory): Likewise.
(remove_folder_directory): Likewise.
(append_xfer_item_list): Likewise.

* e-local-folder.c (construct_loading_metadata): Use
g_path_get_basename() instead of g_basename().

* e-folder-dnd-bridge.c (handle_evolution_path_drag_motion): Use
g_path_get_basename() instead of g_basename().

* e-corba-storage-registry.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* e-corba-shortcuts.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* e-component-registry.c
(sleep_with_g_main_loop_timeout_callback): g_main_loop_* instead
of g_main_*.
(sleep_with_g_main_loop): Likewise.

* e-activity-handler.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* evolution-wizard.c (evolution_wizard_class_init): g_signal_new()
instead of gtk_signal_new().

* evolution-storage-listener.c (class_init): g_signal_new()
instead of gtk_signal_new().

* evolution-shell-view.c (class_init): g_signal_new() instead of
gtk_signal_new().

* evolution-shell-component-dnd.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* evolution-shell-component.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* evolution-session.c: G_STRUCT_OFFSET instead of
GTK_STRUCT_OFFSET.

* evolution-folder-selector-button.c: Do not include e-unicode.h.
(set_folder): No need to convert from UTF8 to locale encoding
anymore.  Removed unused variable.

* evolution-config-control.c (class_init): Use g_signal_new()
instead of gtk_signal_new().

* evolution-activity-client.c (class_init): Use g_signal_new()
instead of gtk_signal_new().

* e-folder-list.c: Do not include e-unicode.h.  Use E_MAKE_TYPE().
(e_folder_list_get_type): Removed explicit implementation of this.
(e_folder_list_set_arg): Removed.
(e_folder_list_get_arg): Removed.
(e_folder_list_set_property): New.
(e_folder_list_get_property): New.
(e_folder_list_destroy): Removed.
(e_folder_list_dispose): New.
(e_folder_list_class_init): Updated accordingly.

* e-folder.c (impl_save_info): Use G_OBJECT_TYPE_NAME() instead of
gtk_type_name().
(impl_load_info): Likewise.
(impl_remove): Likewise.
(class_init): Use g_signal_new() instead of gtk_signal_new().

svn path=/trunk/; revision=19170
2002-12-19 22:03:40 +00:00

437 lines
10 KiB
C
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* evolution-wizard.c
*
* Copyright (C) 2000, 2001, 2002 Ximian, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
* License as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors: Iain Holmes <iain@ximian.com>
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
#include <gtk/gtktypeutils.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-event-source.h>
#include "evolution-wizard.h"
#include "Evolution.h"
#include "e-shell-marshal.h"
struct _EvolutionWizardPrivate {
EvolutionWizardGetControlFn get_fn;
BonoboEventSource *event_source;
void *closure;
int page_count;
};
enum {
NEXT,
PREPARE,
BACK,
FINISH,
CANCEL,
HELP,
LAST_SIGNAL
};
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
static GtkObjectClass *parent_class;
static guint32 signals[LAST_SIGNAL] = { 0 };
static CORBA_long
impl_GNOME_Evolution_Wizard__get_pageCount (PortableServer_Servant servant,
CORBA_Environment *ev)
{
BonoboObject *bonobo_object;
EvolutionWizard *wizard;
EvolutionWizardPrivate *priv;
bonobo_object = bonobo_object_from_servant (servant);
wizard = EVOLUTION_WIZARD (bonobo_object);
priv = wizard->priv;
return priv->page_count;
}
static Bonobo_Control
impl_GNOME_Evolution_Wizard_getControl (PortableServer_Servant servant,
CORBA_long pagenumber,
CORBA_Environment *ev)
{
BonoboObject *bonobo_object;
EvolutionWizard *wizard;
EvolutionWizardPrivate *priv;
BonoboControl *control;
bonobo_object = bonobo_object_from_servant (servant);
wizard = EVOLUTION_WIZARD (bonobo_object);
priv = wizard->priv;
if (pagenumber < 0 || pagenumber >= priv->page_count) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
ex_GNOME_Evolution_Wizard_NoPage, NULL);
return CORBA_OBJECT_NIL;
}
control = priv->get_fn (wizard, pagenumber, priv->closure);
if (control == NULL)
return CORBA_OBJECT_NIL;
return (Bonobo_Control) CORBA_Object_duplicate (BONOBO_OBJREF (control), ev);
}
static void
impl_GNOME_Evolution_Wizard_notifyAction (PortableServer_Servant servant,
CORBA_long pagenumber,
GNOME_Evolution_Wizard_Action action,
CORBA_Environment *ev)
{
BonoboObject *bonobo_object;
EvolutionWizard *wizard;
EvolutionWizardPrivate *priv;
bonobo_object = bonobo_object_from_servant (servant);
wizard = EVOLUTION_WIZARD (bonobo_object);
priv = wizard->priv;
if (pagenumber < 0
|| pagenumber > priv->page_count
|| (action != GNOME_Evolution_Wizard_BACK && pagenumber == priv->page_count)) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
ex_GNOME_Evolution_Wizard_NoPage, NULL);
return;
}
switch (action) {
case GNOME_Evolution_Wizard_NEXT:
g_signal_emit (bonobo_object, signals[NEXT], 0, pagenumber);
break;
case GNOME_Evolution_Wizard_PREPARE:
g_signal_emit (bonobo_object, signals[PREPARE], 0, pagenumber);
break;
case GNOME_Evolution_Wizard_BACK:
g_signal_emit (bonobo_object, signals[BACK], 0, pagenumber);
break;
case GNOME_Evolution_Wizard_FINISH:
g_signal_emit (bonobo_object, signals[FINISH], 0, pagenumber);
break;
case GNOME_Evolution_Wizard_CANCEL:
g_signal_emit (bonobo_object, signals[CANCEL], 0, pagenumber);
break;
case GNOME_Evolution_Wizard_HELP:
g_signal_emit (bonobo_object, signals[HELP], 0, pagenumber);
break;
default:
break;
}
}
static void
impl_dispose (GObject *object)
{
/* (Nothing to do here.) */
(* G_OBJECT_CLASS (parent_class)->dispose) (object);
}
static void
impl_finalize (GObject *object)
{
EvolutionWizard *wizard;
wizard = EVOLUTION_WIZARD (object);
if (wizard->priv == NULL)
return;
g_free (wizard->priv);
wizard->priv = NULL;
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
evolution_wizard_class_init (EvolutionWizardClass *klass)
{
GObjectClass *object_class;
POA_GNOME_Evolution_Wizard__epv *epv = &klass->epv;
object_class = G_OBJECT_CLASS (klass);
object_class->dispose = impl_dispose;
object_class->finalize = impl_finalize;
signals[NEXT]
= g_signal_new ("next",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, next),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
signals[PREPARE]
= g_signal_new ("prepare",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, prepare),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
signals[BACK]
= g_signal_new ("back",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, back),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
signals[FINISH]
= g_signal_new ("finish",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, finish),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
signals[CANCEL]
= g_signal_new ("cancel",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, cancel),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
signals[HELP]
= g_signal_new ("help",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionWizardClass, help),
NULL, NULL,
e_shell_marshal_NONE__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
parent_class = g_type_class_ref(PARENT_TYPE);
epv->_get_pageCount = impl_GNOME_Evolution_Wizard__get_pageCount;
epv->getControl = impl_GNOME_Evolution_Wizard_getControl;
epv->notifyAction = impl_GNOME_Evolution_Wizard_notifyAction;
}
static void
evolution_wizard_init (EvolutionWizard *wizard)
{
wizard->priv = g_new0 (EvolutionWizardPrivate, 1);
}
BONOBO_X_TYPE_FUNC_FULL (EvolutionWizard, GNOME_Evolution_Wizard,
PARENT_TYPE, evolution_wizard);
EvolutionWizard *
evolution_wizard_construct (EvolutionWizard *wizard,
BonoboEventSource *event_source,
EvolutionWizardGetControlFn get_fn,
int num_pages,
void *closure)
{
EvolutionWizardPrivate *priv;
g_return_val_if_fail (BONOBO_IS_EVENT_SOURCE (event_source), NULL);
g_return_val_if_fail (IS_EVOLUTION_WIZARD (wizard), NULL);
priv = wizard->priv;
priv->get_fn = get_fn;
priv->page_count = num_pages;
priv->closure = closure;
priv->event_source = event_source;
bonobo_object_add_interface (BONOBO_OBJECT (wizard),
BONOBO_OBJECT (event_source));
return wizard;
}
EvolutionWizard *
evolution_wizard_new_full (EvolutionWizardGetControlFn get_fn,
int num_pages,
BonoboEventSource *event_source,
void *closure)
{
EvolutionWizard *wizard;
g_return_val_if_fail (num_pages > 0, NULL);
g_return_val_if_fail (BONOBO_IS_EVENT_SOURCE (event_source), NULL);
wizard = g_object_new (evolution_wizard_get_type (), NULL);
return evolution_wizard_construct (wizard, event_source, get_fn, num_pages, closure);
}
EvolutionWizard *
evolution_wizard_new (EvolutionWizardGetControlFn get_fn,
int num_pages,
void *closure)
{
BonoboEventSource *event_source;
g_return_val_if_fail (num_pages > 0, NULL);
event_source = bonobo_event_source_new ();
return evolution_wizard_new_full (get_fn, num_pages, event_source, closure);
}
void
evolution_wizard_set_buttons_sensitive (EvolutionWizard *wizard,
gboolean back_sensitive,
gboolean next_sensitive,
gboolean cancel_sensitive,
CORBA_Environment *opt_ev)
{
EvolutionWizardPrivate *priv;
CORBA_Environment ev;
CORBA_any any;
CORBA_short s;
g_return_if_fail (IS_EVOLUTION_WIZARD (wizard));
priv = wizard->priv;
if (opt_ev == NULL) {
CORBA_exception_init (&ev);
} else {
ev = *opt_ev;
}
s = back_sensitive << 2 | next_sensitive << 1 | cancel_sensitive;
any._type = (CORBA_TypeCode) TC_CORBA_short;
any._value = &s;
bonobo_event_source_notify_listeners (priv->event_source,
EVOLUTION_WIZARD_SET_BUTTONS_SENSITIVE,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
g_warning ("ERROR(evolution_wizard_set_buttons_sensitive): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {
CORBA_exception_free (&ev);
}
}
void
evolution_wizard_set_show_finish (EvolutionWizard *wizard,
gboolean show_finish,
CORBA_Environment *opt_ev)
{
EvolutionWizardPrivate *priv;
CORBA_Environment ev;
CORBA_any any;
CORBA_boolean b;
g_return_if_fail (IS_EVOLUTION_WIZARD (wizard));
priv = wizard->priv;
if (opt_ev == NULL) {
CORBA_exception_init (&ev);
} else {
ev = *opt_ev;
}
b = show_finish;
any._type = (CORBA_TypeCode) TC_CORBA_boolean;
any._value = &b;
bonobo_event_source_notify_listeners (priv->event_source,
EVOLUTION_WIZARD_SET_SHOW_FINISH,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
g_warning ("ERROR(evolution_wizard_set_show_finish): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {
CORBA_exception_free (&ev);
}
}
void
evolution_wizard_set_page (EvolutionWizard *wizard,
int page_number,
CORBA_Environment *opt_ev)
{
EvolutionWizardPrivate *priv;
CORBA_Environment ev;
CORBA_any any;
CORBA_short s;
g_return_if_fail (IS_EVOLUTION_WIZARD (wizard));
priv = wizard->priv;
g_return_if_fail (page_number >= 0 && page_number < priv->page_count);
if (opt_ev == NULL) {
CORBA_exception_init (&ev);
} else {
ev = *opt_ev;
}
s = page_number;
any._type = (CORBA_TypeCode) TC_CORBA_short;
any._value = &s;
bonobo_event_source_notify_listeners (priv->event_source,
EVOLUTION_WIZARD_SET_PAGE,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
g_warning ("ERROR(evolution_wizard_set_page): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {
CORBA_exception_free (&ev);
}
}
BonoboEventSource *
evolution_wizard_get_event_source (EvolutionWizard *wizard)
{
g_return_val_if_fail (IS_EVOLUTION_WIZARD (wizard), NULL);
return wizard->priv->event_source;
}
Reference in New Issue View Git Blame Copy Permalink