diff -uNr inkscape-cvs/ChangeLog inkscape-cvs-desactivate/ChangeLog --- inkscape-cvs/ChangeLog 2003-11-10 23:31:57.000000000 -0800 +++ inkscape-cvs-desactivate/ChangeLog 2003-11-15 22:55:31.000000000 -0800 @@ -4447,16 +4447,16 @@ * src/sodipodi.c (sodipodi_activate_desktop_private): Default method implementation to chain activation signal on desktop - (sodipodi_desactivate_desktop_private): Ditto + (sodipodi_deactivate_desktop_private): Ditto * src/desktop.c (sp_desktop_new): Owner does not have document pointer any more, so had to change signature here (sp_desktop_widget_init): Moved activation signals to public constructor (sp_dtw_desktop_activate): Activation signal handler - (sp_dtw_desktop_desactivate): Ditto - (sp_desktop_widget_new): Use desktop "activate" and "desactivate" signals + (sp_dtw_desktop_deactivate): Ditto + (sp_desktop_widget_new): Use desktop "activate" and "deactivate" signals instead of sodipodi ones, signature change - (sp_desktop_class_init): Added "activate" and "desactivate" signals + (sp_desktop_class_init): Added "activate" and "deactivate" signals * src/dialogs/display-settings.c: Removed glade, made mostly dynamic diff -uNr inkscape-cvs/src/desktop.c inkscape-cvs-desactivate/src/desktop.c --- inkscape-cvs/src/desktop.c 2003-11-11 04:46:31.000000000 -0800 +++ inkscape-cvs-desactivate/src/desktop.c 2003-11-15 22:56:01.000000000 -0800 @@ -52,7 +52,7 @@ enum { ACTIVATE, - DESACTIVATE, + DEACTIVATE, MODIFIED, LAST_SIGNAL }; @@ -133,10 +133,10 @@ NULL, NULL, sp_marshal_NONE__NONE, G_TYPE_NONE, 0); - signals[DESACTIVATE] = g_signal_new ("desactivate", + signals[DEACTIVATE] = g_signal_new ("deactivate", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (SPDesktopClass, desactivate), + G_STRUCT_OFFSET (SPDesktopClass, deactivate), NULL, NULL, sp_marshal_NONE__NONE, G_TYPE_NONE, 0); @@ -242,7 +242,7 @@ if (active) { g_signal_emit (G_OBJECT (desktop), signals[ACTIVATE], 0); } else { - g_signal_emit (G_OBJECT (desktop), signals[DESACTIVATE], 0); + g_signal_emit (G_OBJECT (desktop), signals[DEACTIVATE], 0); } } } @@ -496,7 +496,7 @@ while (dt->event_context) { ec = dt->event_context; - sp_event_context_desactivate (ec); + sp_event_context_deactivate (ec); dt->event_context = ec->next; sp_event_context_finish (ec); g_object_unref (G_OBJECT (ec)); @@ -525,7 +525,7 @@ g_object_unref (G_OBJECT (ec)); } - if (dt->event_context) sp_event_context_desactivate (dt->event_context); + if (dt->event_context) sp_event_context_deactivate (dt->event_context); repr = (config) ? inkscape_get_repr (INKSCAPE, config) : NULL; ec = sp_event_context_new (type, dt, repr, key); ec->next = dt->event_context; @@ -542,7 +542,7 @@ g_return_if_fail (dt->event_context); g_return_if_fail (dt->event_context->next); ec = dt->event_context; - sp_event_context_desactivate (ec); + sp_event_context_deactivate (ec); dt->event_context = ec->next; sp_event_context_activate (dt->event_context); } @@ -624,7 +624,7 @@ static void sp_desktop_widget_view_status_set (SPView *view, const gchar *status, gboolean isdefault, SPDesktopWidget *dtw); static void sp_dtw_desktop_activate (SPDesktop *desktop, SPDesktopWidget *dtw); -static void sp_dtw_desktop_desactivate (SPDesktop *desktop, SPDesktopWidget *dtw); +static void sp_dtw_desktop_deactivate (SPDesktop *desktop, SPDesktopWidget *dtw); static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw); static void sp_desktop_widget_namedview_modified (SPNamedView *nv, guint flags, SPDesktopWidget *dtw); @@ -935,7 +935,7 @@ } void -sp_dtw_desktop_desactivate (SPDesktop *desktop, SPDesktopWidget *dtw) +sp_dtw_desktop_deactivate (SPDesktop *desktop, SPDesktopWidget *dtw) { #if 0 gtk_widget_set_sensitive (dtw->hruler, FALSE); @@ -1019,7 +1019,7 @@ /* Connect activation signals to update indicator */ g_signal_connect (G_OBJECT (dtw->desktop), "activate", G_CALLBACK (sp_dtw_desktop_activate), dtw); - g_signal_connect (G_OBJECT (dtw->desktop), "desactivate", G_CALLBACK (sp_dtw_desktop_desactivate), dtw); + g_signal_connect (G_OBJECT (dtw->desktop), "deactivate", G_CALLBACK (sp_dtw_desktop_deactivate), dtw); g_signal_connect (G_OBJECT (dtw->desktop), "shutdown", G_CALLBACK (sp_dtw_desktop_shutdown), dtw); diff -uNr inkscape-cvs/src/desktop.h inkscape-cvs-desactivate/src/desktop.h --- inkscape-cvs/src/desktop.h 2003-11-01 16:12:23.000000000 -0800 +++ inkscape-cvs-desactivate/src/desktop.h 2003-11-15 22:55:31.000000000 -0800 @@ -68,7 +68,7 @@ SPViewClass parent_class; void (* activate) (SPDesktop *desktop); - void (* desactivate) (SPDesktop *desktop); + void (* deactivate) (SPDesktop *desktop); void (* modified) (SPDesktop *desktop, guint flags); }; diff -uNr inkscape-cvs/src/dialogs/desktop-properties.c inkscape-cvs-desactivate/src/dialogs/desktop-properties.c --- inkscape-cvs/src/dialogs/desktop-properties.c 2003-11-08 19:00:19.000000000 -0800 +++ inkscape-cvs-desactivate/src/dialogs/desktop-properties.c 2003-11-15 22:55:31.000000000 -0800 @@ -41,7 +41,7 @@ static GtkWidget *sp_desktop_dialog_new (void); static void sp_dtw_activate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); -static void sp_dtw_desactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); +static void sp_dtw_deactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); static void sp_dtw_update (GtkWidget *dialog, SPDesktop *desktop); static GtkWidget *sp_color_picker_new (gchar *colorkey, gchar *alphakey, gchar *title, guint32 rgba); @@ -286,7 +286,7 @@ /* fixme: We should listen namedview changes here as well */ g_signal_connect (G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_dtw_activate_desktop), dialog); - g_signal_connect (G_OBJECT (INKSCAPE), "desactivate_desktop", G_CALLBACK (sp_dtw_desactivate_desktop), dialog); + g_signal_connect (G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (sp_dtw_deactivate_desktop), dialog); sp_dtw_update (dialog, SP_ACTIVE_DESKTOP); return dialog; @@ -299,7 +299,7 @@ } static void -sp_dtw_desactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog) +sp_dtw_deactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog) { sp_dtw_update (dialog, NULL); } diff -uNr inkscape-cvs/src/dialogs/document-properties.c inkscape-cvs-desactivate/src/dialogs/document-properties.c --- inkscape-cvs/src/dialogs/document-properties.c 2003-10-30 22:28:39.000000000 -0800 +++ inkscape-cvs-desactivate/src/dialogs/document-properties.c 2003-11-15 22:55:31.000000000 -0800 @@ -45,7 +45,7 @@ static GtkWidget *sp_doc_dialog_new (void); static void sp_doc_dialog_activate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); -static void sp_doc_dialog_desactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); +static void sp_doc_dialog_deactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog); static void sp_doc_dialog_update (GtkWidget *dialog, SPDocument *doc); static void @@ -252,7 +252,7 @@ /* fixme: We should listen namedview changes here as well */ g_signal_connect (G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_doc_dialog_activate_desktop), dialog); - g_signal_connect (G_OBJECT (INKSCAPE), "desactivate_desktop", G_CALLBACK (sp_doc_dialog_desactivate_desktop), dialog); + g_signal_connect (G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (sp_doc_dialog_deactivate_desktop), dialog); sp_doc_dialog_update (dialog, SP_ACTIVE_DOCUMENT); return dialog; @@ -265,7 +265,7 @@ } static void -sp_doc_dialog_desactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog) +sp_doc_dialog_deactivate_desktop (Inkscape *inkscape, SPDesktop *desktop, GtkWidget *dialog) { sp_doc_dialog_update (dialog, NULL); } diff -uNr inkscape-cvs/src/event-context.c inkscape-cvs-desactivate/src/event-context.c --- inkscape-cvs/src/event-context.c 2003-11-10 03:09:49.000000000 -0800 +++ inkscape-cvs-desactivate/src/event-context.c 2003-11-15 22:55:31.000000000 -0800 @@ -464,7 +464,7 @@ } void -sp_event_context_desactivate (SPEventContext *ec) +sp_event_context_deactivate (SPEventContext *ec) { g_return_if_fail (ec != NULL); g_return_if_fail (SP_IS_EVENT_CONTEXT (ec)); diff -uNr inkscape-cvs/src/event-context.h inkscape-cvs-desactivate/src/event-context.h --- inkscape-cvs/src/event-context.h 2003-11-01 16:45:47.000000000 -0800 +++ inkscape-cvs-desactivate/src/event-context.h 2003-11-15 22:55:31.000000000 -0800 @@ -40,7 +40,7 @@ void (* finish) (SPEventContext *ec); void (* set) (SPEventContext *ec, const gchar *key, const gchar *val); void (* activate) (SPEventContext *ec); - void (* desactivate) (SPEventContext *ec); + void (* deactivate) (SPEventContext *ec); gint (* root_handler) (SPEventContext *ec, GdkEvent *event); gint (* item_handler) (SPEventContext *ec, SPItem *item, GdkEvent *event); /* fixme: I do not like Gtk+ stuff here (Lauris) */ @@ -56,7 +56,7 @@ void sp_event_context_finish (SPEventContext *ec); void sp_event_context_read (SPEventContext *ec, const gchar *key); void sp_event_context_activate (SPEventContext *ec); -void sp_event_context_desactivate (SPEventContext *ec); +void sp_event_context_deactivate (SPEventContext *ec); gint sp_event_context_root_handler (SPEventContext *ec, GdkEvent *event); gint sp_event_context_item_handler (SPEventContext *ec, SPItem *item, GdkEvent *event); diff -uNr inkscape-cvs/src/inkscape.c inkscape-cvs-desactivate/src/inkscape.c --- inkscape-cvs/src/inkscape.c 2003-10-30 02:04:30.000000000 -0800 +++ inkscape-cvs-desactivate/src/inkscape.c 2003-11-15 22:56:01.000000000 -0800 @@ -59,7 +59,7 @@ NEW_DESKTOP, DESTROY_DESKTOP, ACTIVATE_DESKTOP, - DESACTIVATE_DESKTOP, + DEACTIVATE_DESKTOP, NEW_DOCUMENT, DESTROY_DOCUMENT, COLOR_SET, @@ -73,7 +73,7 @@ static void inkscape_dispose (GObject *object); static void inkscape_activate_desktop_private (Inkscape *inkscape, SPDesktop *desktop); -static void inkscape_desactivate_desktop_private (Inkscape *inkscape, SPDesktop *desktop); +static void inkscape_deactivate_desktop_private (Inkscape *inkscape, SPDesktop *desktop); static void inkscape_init_config (SPReprDoc *doc, const gchar *config_name, const gchar *skeleton, int skel_size, const gchar *e_mkdir, @@ -104,7 +104,7 @@ void (* new_desktop) (Inkscape * inkscape, SPDesktop * desktop); void (* destroy_desktop) (Inkscape * inkscape, SPDesktop * desktop); void (* activate_desktop) (Inkscape * inkscape, SPDesktop * desktop); - void (* desactivate_desktop) (Inkscape * inkscape, SPDesktop * desktop); + void (* deactivate_desktop) (Inkscape * inkscape, SPDesktop * desktop); void (* new_document) (Inkscape *inkscape, SPDocument *doc); void (* destroy_document) (Inkscape *inkscape, SPDocument *doc); @@ -202,10 +202,10 @@ sp_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - inkscape_signals[DESACTIVATE_DESKTOP] = g_signal_new ("desactivate_desktop", + inkscape_signals[DEACTIVATE_DESKTOP] = g_signal_new ("deactivate_desktop", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (InkscapeClass, desactivate_desktop), + G_STRUCT_OFFSET (InkscapeClass, deactivate_desktop), NULL, NULL, sp_marshal_NONE__POINTER, G_TYPE_NONE, 1, @@ -238,7 +238,7 @@ object_class->dispose = inkscape_dispose; klass->activate_desktop = inkscape_activate_desktop_private; - klass->desactivate_desktop = inkscape_desactivate_desktop_private; + klass->deactivate_desktop = inkscape_deactivate_desktop_private; } static void @@ -310,7 +310,7 @@ } static void -inkscape_desactivate_desktop_private (Inkscape *inkscape, SPDesktop *desktop) +inkscape_deactivate_desktop_private (Inkscape *inkscape, SPDesktop *desktop) { sp_desktop_set_active (desktop, FALSE); } @@ -728,7 +728,7 @@ g_assert (g_slist_find (inkscape->desktops, desktop)); if (DESKTOP_IS_ACTIVE (desktop)) { - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DESACTIVATE_DESKTOP], 0, desktop); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DEACTIVATE_DESKTOP], 0, desktop); if (inkscape->desktops->next != NULL) { SPDesktop * new_desktop; new_desktop = (SPDesktop *) inkscape->desktops->next->data; @@ -765,7 +765,7 @@ current = (SPDesktop *) inkscape->desktops->data; - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DESACTIVATE_DESKTOP], 0, current); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DEACTIVATE_DESKTOP], 0, current); inkscape->desktops = g_slist_remove (inkscape->desktops, desktop); inkscape->desktops = g_slist_prepend (inkscape->desktops, desktop); diff -uNr inkscape-cvs/src/inkscape.h inkscape-cvs-desactivate/src/inkscape.h --- inkscape-cvs/src/inkscape.h 2003-11-02 16:04:51.000000000 -0800 +++ inkscape-cvs-desactivate/src/inkscape.h 2003-11-15 22:55:31.000000000 -0800 @@ -22,11 +22,11 @@ * "new_desktop" * "destroy_desktop" * "desktop_activate" - * "desktop_desactivate" + * "desktop_deactivate" * "new_document" * "destroy_document" * "document_activate" - * "document_desactivate" + * "document_deactivate" * "color_set" * */