From aececffc14564bc496a333845c9c5d4ac910d51e Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 2 Dec 2002 03:07:59 +0000 Subject: removed warning about e_notice. its used too much, its here to stay. 2002-11-27 Not Zed * e-msg-composer.c (save): removed warning about e_notice. its used too much, its here to stay. * *.[ch]: run fix.sh over everything. svn path=/trunk/; revision=18973 --- composer/ChangeLog | 7 +++++++ composer/e-icon-list.h | 8 ++++---- composer/e-msg-composer-attachment-bar.h | 8 ++++---- composer/e-msg-composer-attachment.h | 8 ++++---- composer/e-msg-composer-hdrs.c | 10 +++++----- composer/e-msg-composer-hdrs.h | 8 ++++---- composer/e-msg-composer.c | 19 +++++++++---------- composer/e-msg-composer.h | 8 ++++---- composer/evolution-composer.c | 4 ++-- composer/evolution-composer.h | 8 ++++---- composer/listener.h | 8 ++++---- 11 files changed, 51 insertions(+), 45 deletions(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index 44db106a97..6f7e0cd3d9 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2002-11-27 Not Zed + + * e-msg-composer.c (save): removed warning about e_notice. its + used too much, its here to stay. + + * *.[ch]: run fix.sh over everything. + 2002-12-01 Jeffrey Stedfast * e-msg-composer.c: s/g_str[n]casecmp/str[n]casecmp diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h index 73eae95b4a..3b690e1a86 100644 --- a/composer/e-icon-list.h +++ b/composer/e-icon-list.h @@ -43,10 +43,10 @@ extern "C" { #endif /* __cplusplus */ #define E_TYPE_ICON_LIST (e_icon_list_get_type ()) -#define E_ICON_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList)) -#define E_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass)) -#define E_IS_ICON_LIST(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_ICON_LIST)) -#define E_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST)) +#define E_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ICON_LIST, EIconList)) +#define E_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass)) +#define E_IS_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ICON_LIST)) +#define E_IS_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST)) #define E_ICON_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ICON_LIST, EIconListClass)) typedef struct _EIconList EIconList; diff --git a/composer/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h index 9a6fe3265f..4a5ab97a11 100644 --- a/composer/e-msg-composer-attachment-bar.h +++ b/composer/e-msg-composer-attachment-bar.h @@ -35,13 +35,13 @@ extern "C" { #define E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR \ (e_msg_composer_attachment_bar_get_type ()) #define E_MSG_COMPOSER_ATTACHMENT_BAR(obj) \ - (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar)) + (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar)) #define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass)) #define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \ - (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR)) #define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR)) + (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR)) typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate; diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h index d3cdd72214..caef6ebc58 100644 --- a/composer/e-msg-composer-attachment.h +++ b/composer/e-msg-composer-attachment.h @@ -34,10 +34,10 @@ extern "C" { #endif /* __cplusplus */ #define E_TYPE_MSG_COMPOSER_ATTACHMENT (e_msg_composer_attachment_get_type ()) -#define E_MSG_COMPOSER_ATTACHMENT(obj) (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment)) -#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass)) -#define E_IS_MSG_COMPOSER_ATTACHMENT(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT)) -#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT)) +#define E_MSG_COMPOSER_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment)) +#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass)) +#define E_IS_MSG_COMPOSER_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT)) +#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT)) typedef struct _EMsgComposerAttachment EMsgComposerAttachment; diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 6dce1ad737..f3f461206e 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -253,7 +253,7 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs) /* this is so we can later set which one we want */ hdrs->priv->from_options = g_slist_append (hdrs->priv->from_options, item); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show (item); i++; } @@ -392,7 +392,7 @@ create_headers (EMsgComposerHdrs *hdrs) */ priv->reply_to.label = gtk_label_new (_("Reply-To:")); priv->reply_to.entry = e_entry_new (); - gtk_object_set (GTK_OBJECT (priv->reply_to.entry), + g_object_set((priv->reply_to.entry), "editable", TRUE, "use_ellipsis", TRUE, "allow_newlines", FALSE, @@ -409,7 +409,7 @@ create_headers (EMsgComposerHdrs *hdrs) */ priv->subject.label = gtk_label_new (_("Subject:")); priv->subject.entry = e_entry_new (); - gtk_object_set (GTK_OBJECT (priv->subject.entry), + g_object_set((priv->subject.entry), "editable", TRUE, "use_ellipsis", TRUE, "allow_newlines", FALSE, @@ -990,7 +990,7 @@ e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs, g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs)); g_return_if_fail (subject != NULL); - gtk_object_set (GTK_OBJECT (hdrs->priv->subject.entry), + g_object_set((hdrs->priv->subject.entry), "text", subject, NULL); } @@ -1155,7 +1155,7 @@ e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs) g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL); - gtk_object_get (GTK_OBJECT (hdrs->priv->subject.entry), + g_object_get((hdrs->priv->subject.entry), "text", &subject, NULL); return subject; diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h index c175dc6564..0baffea562 100644 --- a/composer/e-msg-composer-hdrs.h +++ b/composer/e-msg-composer-hdrs.h @@ -39,10 +39,10 @@ extern "C" { #endif /* __cplusplus */ #define E_TYPE_MSG_COMPOSER_HDRS (e_msg_composer_hdrs_get_type ()) -#define E_MSG_COMPOSER_HDRS(obj) (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs)) -#define E_MSG_COMPOSER_HDRS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass)) -#define E_IS_MSG_COMPOSER_HDRS(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS)) -#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS)) +#define E_MSG_COMPOSER_HDRS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs)) +#define E_MSG_COMPOSER_HDRS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass)) +#define E_IS_MSG_COMPOSER_HDRS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS)) +#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS)) #define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 58c39e9e00..183a974f45 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1176,10 +1176,9 @@ save (EMsgComposer *composer, const char *file_name) Bonobo_PersistFile_save (composer->persist_file_interface, my_file_name, &ev); if (ev._major != CORBA_NO_EXCEPTION) { -#warning "e_notice??" char *tmp = g_path_get_basename(my_file_name); - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Error saving file: %s"), tmp); g_free(tmp); } else @@ -1202,7 +1201,7 @@ load (EMsgComposer *composer, const char *file_name) if (ev._major != CORBA_NO_EXCEPTION) { char *tmp = g_path_get_basename(file_name); - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Error loading file: %s"), tmp); g_free(tmp); } @@ -1237,7 +1236,7 @@ autosave_save_draft (EMsgComposer *composer) file = composer->autosave_file; if (fd == -1) { - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Error accessing file: %s"), file); return FALSE; } @@ -1245,21 +1244,21 @@ autosave_save_draft (EMsgComposer *composer) message = e_msg_composer_get_message_draft (composer); if (message == NULL) { - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Unable to retrieve message from editor")); return FALSE; } if (lseek (fd, (off_t)0, SEEK_SET) == -1) { camel_object_unref (message); - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Unable to seek on file: %s\n%s"), file, g_strerror (errno)); return FALSE; } if (ftruncate (fd, (off_t)0) == -1) { camel_object_unref (message); - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Unable to truncate file: %s\n%s"), file, g_strerror (errno)); return FALSE; } @@ -1268,7 +1267,7 @@ autosave_save_draft (EMsgComposer *composer) camelfd = dup(fd); if (fd == -1) { camel_object_unref (message); - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Unable to copy file descriptor: %s\n%s"), file, g_strerror (errno)); return FALSE; } @@ -1277,7 +1276,7 @@ autosave_save_draft (EMsgComposer *composer) stream = camel_stream_fs_new_with_fd (camelfd); if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream) == -1 || camel_stream_close (CAMEL_STREAM (stream)) == -1) { - e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (composer), GTK_MESSAGE_ERROR, _("Error autosaving message: %s\n %s"), file, strerror(errno)); success = FALSE; @@ -1965,7 +1964,7 @@ setup_signatures_menu (EMsgComposer *composer) #define ADD(x) \ mi = (x ? gtk_menu_item_new_with_label (x) : gtk_menu_item_new ()); \ gtk_widget_show (mi); \ - gtk_menu_append (GTK_MENU (menu), mi); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); menu = gtk_menu_new (); ADD (_("None")); diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index b8fe6937a1..d60aa91a7e 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -45,10 +45,10 @@ extern "C" { #define E_TYPE_MSG_COMPOSER (e_msg_composer_get_type ()) -#define E_MSG_COMPOSER(obj) (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer)) -#define E_MSG_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass)) -#define E_IS_MSG_COMPOSER(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER)) -#define E_IS_MSG_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER)) +#define E_MSG_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer)) +#define E_MSG_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass)) +#define E_IS_MSG_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MSG_COMPOSER)) +#define E_IS_MSG_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER)) diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index cf435665a6..be540b8d2e 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -403,7 +403,7 @@ static BonoboObject * factory_fn (BonoboGenericFactory *factory, const char *id, void *closure) { if (!mail_config_is_configured ()) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Could not create composer window, because you " "have not yet\nconfigured any identities in the " "mail component.")); @@ -418,7 +418,7 @@ evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer), { if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID, factory_fn, NULL) == NULL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot initialize the Evolution composer.")); exit (1); } diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h index 424a623a82..12da130221 100644 --- a/composer/evolution-composer.h +++ b/composer/evolution-composer.h @@ -35,10 +35,10 @@ extern "C" { #endif /* __cplusplus */ #define EVOLUTION_TYPE_COMPOSER (evolution_composer_get_type ()) -#define EVOLUTION_COMPOSER(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer)) -#define EVOLUTION_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass)) -#define EVOLUTION_IS_COMPOSER(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_COMPOSER)) -#define EVOLUTION_IS_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER)) +#define EVOLUTION_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer)) +#define EVOLUTION_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass)) +#define EVOLUTION_IS_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_COMPOSER)) +#define EVOLUTION_IS_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER)) typedef struct _EvolutionComposer EvolutionComposer; typedef struct _EvolutionComposerClass EvolutionComposerClass; diff --git a/composer/listener.h b/composer/listener.h index cb395b9a62..d238583453 100644 --- a/composer/listener.h +++ b/composer/listener.h @@ -27,10 +27,10 @@ #include "e-msg-composer.h" #define EDITOR_LISTENER_TYPE (listener_get_type ()) -#define EDITOR_LISTENER(o) (GTK_CHECK_CAST ((o), EDITOR_LISTENER_TYPE, EditorListener)) -#define EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), EDITOR_LISTENER_TYPE, EditorListenerClass)) -#define IS_EDITOR_LISTENER(o) (GTK_CHECK_TYPE ((o), EDITOR_LISTENER_TYPE)) -#define IS_EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_LISTENER_TYPE)) +#define EDITOR_LISTENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EDITOR_LISTENER_TYPE, EditorListener)) +#define EDITOR_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EDITOR_LISTENER_TYPE, EditorListenerClass)) +#define IS_EDITOR_LISTENER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EDITOR_LISTENER_TYPE)) +#define IS_EDITOR_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EDITOR_LISTENER_TYPE)) typedef struct { BonoboObject parent; -- cgit v1.2.3