diff options
Diffstat (limited to 'widgets/misc')
72 files changed, 968 insertions, 968 deletions
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index c324268db4..b9351878a6 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -246,7 +246,7 @@ static void e_activity_handler_class_init (EActivityHandlerClass *activity_handler_class) { GObjectClass *object_class = (GObjectClass *) activity_handler_class; - + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c index 0525887cc4..192fba56e0 100644 --- a/widgets/misc/e-attachment-bar.c +++ b/widgets/misc/e-attachment-bar.c @@ -70,7 +70,7 @@ static GnomeIconListClass *parent_class = NULL; struct _EAttachmentBarPrivate { GtkWidget *attach; /* attachment file dialogue, if active */ - + gboolean batch_unref; GPtrArray *attachments; char *path; @@ -92,7 +92,7 @@ static char * size_to_string (gulong size) { char *size_string; - + /* FIXME: The following should probably go into a separate module, as we might have to do the same thing in other places as well. Also, I am not sure this will be OK for all the languages. */ @@ -109,7 +109,7 @@ attachment_destroy (EAttachmentBar *bar, EAttachment *attachment) { if (bar->priv->batch_unref) return; - + if (g_ptr_array_remove (bar->priv->attachments, attachment)) { update (bar); g_signal_emit (bar, signals[CHANGED], 0); @@ -127,13 +127,13 @@ static void add_common (EAttachmentBar *bar, EAttachment *attachment) { g_return_if_fail (attachment != NULL); - + g_ptr_array_add (bar->priv->attachments, attachment); g_object_weak_ref ((GObject *) attachment, (GWeakNotify) attachment_destroy, bar); g_signal_connect (attachment, "changed", G_CALLBACK (attachment_changed_cb), bar); - + update (bar); - + g_signal_emit (bar, signals[CHANGED], 0); } @@ -148,9 +148,9 @@ add_from_file (EAttachmentBar *bar, const char *file_name, const char *dispositi { EAttachment *attachment; CamelException ex; - + camel_exception_init (&ex); - + if ((attachment = e_attachment_new (file_name, disposition, &ex))) { add_common (bar, attachment); } else { @@ -170,7 +170,7 @@ calculate_height_width(EAttachmentBar *bar, int *new_width, int *new_height) int width, height, icon_width; PangoFontMetrics *metrics; PangoContext *context; - + context = gtk_widget_get_pango_context ((GtkWidget *) bar); metrics = pango_context_get_metrics (context, ((GtkWidget *) bar)->style->font_desc, pango_context_get_language (context)); width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (metrics)) * 15; @@ -205,20 +205,20 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) GdkPixbufLoader *loader; gboolean error = TRUE; GdkPixbuf *pixbuf; - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); mstream = (CamelStreamMem *) camel_stream_mem_new (); - + camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); - + /* Stream image into pixbuf loader */ loader = gdk_pixbuf_loader_new (); error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL); gdk_pixbuf_loader_close (loader, NULL); - + if (!error) { int ratio, width, height; - + /* Shrink pixbuf */ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); width = gdk_pixbuf_get_width (pixbuf); @@ -240,7 +240,7 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) width = 1; } } - + attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width,height,GDK_INTERP_BILINEAR); pixbuf = attachment->pixbuf_cache; g_object_ref(pixbuf); @@ -248,7 +248,7 @@ e_attachment_bar_create_attachment_cache (EAttachment *attachment) attachment->pixbuf_cache = NULL; g_warning ("GdkPixbufLoader Error"); } - + /* Destroy everything */ g_object_unref (loader); camel_object_unref (mstream); @@ -262,14 +262,14 @@ update (EAttachmentBar *bar) GnomeIconList *icon_list; int bar_width, bar_height; int i; - + priv = bar->priv; icon_list = GNOME_ICON_LIST (bar); - + gnome_icon_list_freeze (icon_list); - + gnome_icon_list_clear (icon_list); - + /* FIXME could be faster, but we don't care. */ for (i = 0; i < priv->attachments->len; i++) { EAttachment *attachment; @@ -277,9 +277,9 @@ update (EAttachmentBar *bar) char *size_string, *label; GdkPixbuf *pixbuf = NULL; const char *desc; - + attachment = priv->attachments->pdata[i]; - + if (!attachment->is_available_local || !attachment->body) { if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); @@ -287,9 +287,9 @@ update (EAttachmentBar *bar) } continue; } - + content_type = camel_mime_part_get_content_type (attachment->body); - /* Get the image out of the attachment + /* Get the image out of the attachment and create a thumbnail for it */ if ((pixbuf = attachment->pixbuf_cache)) { g_object_ref(pixbuf); @@ -298,20 +298,20 @@ update (EAttachmentBar *bar) CamelStreamMem *mstream; GdkPixbufLoader *loader; gboolean error = TRUE; - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); mstream = (CamelStreamMem *) camel_stream_mem_new (); - + camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); - + /* Stream image into pixbuf loader */ loader = gdk_pixbuf_loader_new (); error = !gdk_pixbuf_loader_write (loader, mstream->buffer->data, mstream->buffer->len, NULL); gdk_pixbuf_loader_close (loader, NULL); - + if (!error) { int ratio, width, height; - + /* Shrink pixbuf */ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); width = gdk_pixbuf_get_width (pixbuf); @@ -333,7 +333,7 @@ update (EAttachmentBar *bar) width = 1; } } - + attachment->pixbuf_cache = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); pixbuf = attachment->pixbuf_cache; @@ -342,32 +342,32 @@ update (EAttachmentBar *bar) pixbuf = NULL; g_warning ("GdkPixbufLoader Error"); } - + /* Destroy everything */ g_object_unref (loader); camel_object_unref (mstream); } - + desc = camel_mime_part_get_description (attachment->body); if (!desc || *desc == '\0') { if (attachment->file_name) desc = attachment->file_name; - else + else desc = camel_mime_part_get_filename (attachment->body); } - + if (!desc) desc = _("attachment"); - + if (attachment->size && (size_string = size_to_string (attachment->size))) { label = g_strdup_printf ("%s (%s)", desc, size_string); g_free (size_string); } else label = g_strdup (desc); - + if (pixbuf == NULL) { char *mime_type; - + mime_type = camel_content_type_simple (content_type); pixbuf = e_icon_for_mime_type (mime_type, 48); if (pixbuf == NULL) { @@ -376,60 +376,60 @@ update (EAttachmentBar *bar) } g_free (mime_type); } - + if (pixbuf) { GdkPixbuf *pixbuf_orig = pixbuf; pixbuf = gdk_pixbuf_add_alpha (pixbuf_orig, TRUE, 255, 255, 255); - + /* gdk_pixbuf_add_alpha returns a newly allocated pixbuf, - free the original one. + free the original one. */ g_object_unref (pixbuf_orig); - + /* In case of a attachment bar, in a signed/encrypted part, display the status as a emblem*/ if (attachment->sign) { /* Show the signature status at the right-bottom.*/ GdkPixbuf *sign = NULL; int x, y; - + if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_BAD) sign = e_icon_factory_get_icon ("stock_signature-bad", E_ICON_SIZE_MENU); else if (attachment->sign == CAMEL_CIPHER_VALIDITY_SIGN_GOOD) sign = e_icon_factory_get_icon ("stock_signature-ok", E_ICON_SIZE_MENU); else sign = e_icon_factory_get_icon ("stock_signature", E_ICON_SIZE_MENU); - + x = gdk_pixbuf_get_width (pixbuf) - 17; y = gdk_pixbuf_get_height (pixbuf) - 17; - + gdk_pixbuf_copy_area (sign, 0, 0, 16, 16, pixbuf, x, y); g_object_unref (sign); } - + if (attachment->encrypt) { /* Show the encryption status at the top left.*/ GdkPixbuf *encrypt = e_icon_factory_get_icon ("stock_lock-ok", E_ICON_SIZE_MENU); - + gdk_pixbuf_copy_area (encrypt, 0, 0, 16, 16, pixbuf, 1, 1); g_object_unref (encrypt); } - + gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label); g_object_unref (pixbuf); } - + g_free (label); } - + gnome_icon_list_thaw (icon_list); - + /* Resize */ if (bar->expand) { gtk_widget_get_size_request ((GtkWidget *) bar, &bar_width, &bar_height); - + if (bar->priv->attachments->len) { int per_col, rows, height, width; - + calculate_height_width(bar, &width, &height); per_col = bar_width / width; per_col = (per_col ? per_col : 1); @@ -450,19 +450,19 @@ update_remote_file (EAttachment *attachment, EAttachmentBar *bar) update (bar); return; } - + base = g_path_get_basename(attachment->file_name); msg = g_strdup_printf("%s (%d%%)", base, attachment->percentage); g_free(base); icon_list = GNOME_ICON_LIST (bar); - + gnome_icon_list_freeze (icon_list); item = gnome_icon_list_get_icon_text_item (icon_list, attachment->index); if (!item->is_text_allocated) g_free (item->text); - + gnome_icon_text_item_configure (item, item->x, item->y, item->width, item->fontname, msg, item->is_editable, TRUE); gnome_icon_list_thaw (icon_list); @@ -478,12 +478,12 @@ e_attachment_bar_remove_selected (EAttachmentBar *bar) GPtrArray *temp_arr; g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + priv = bar->priv; - + if (!(items = gnome_icon_list_get_selection ((GnomeIconList *) bar))) return; - + temp_arr = g_ptr_array_new (); while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data) - nrem) < priv->attachments->len) { @@ -492,19 +492,19 @@ e_attachment_bar_remove_selected (EAttachmentBar *bar) g_ptr_array_remove_index (priv->attachments, id); nrem++; } - + items = items->next; } g_ptr_array_foreach (temp_arr, (GFunc)g_object_unref, NULL); g_ptr_array_free (temp_arr, TRUE); - + update (bar); g_signal_emit (bar, signals[CHANGED], 0); - + id++; - + if ((left = gnome_icon_list_get_num_icons ((GnomeIconList *) bar)) > 0) gnome_icon_list_focus_icon ((GnomeIconList *) bar, left > id ? id : left - 1); } @@ -528,18 +528,18 @@ e_attachment_bar_edit_selected (EAttachmentBar *bar) EAttachment *attachment; GList *items; int id; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + priv = bar->priv; - + items = gnome_icon_list_get_selection ((GnomeIconList *) bar); while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data)) < priv->attachments->len) { attachment = priv->attachments->pdata[id]; e_attachment_edit (attachment, GTK_WIDGET (bar)); } - + items = items->next; } } @@ -548,7 +548,7 @@ GtkWidget ** e_attachment_bar_get_selector(EAttachmentBar *bar) { g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + return &bar->priv->attach; } @@ -568,25 +568,25 @@ e_attachment_bar_get_selected (EAttachmentBar *bar) EAttachment *attachment; GList *items; int id; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + items = gnome_icon_list_get_selection ((GnomeIconList *) bar); - + while (items != NULL) { if ((id = GPOINTER_TO_INT (items->data)) < priv->attachments->len) { attachment = priv->attachments->pdata[id]; attachments = g_slist_prepend (attachments, attachment); g_object_ref (attachment); } - + items = items->next; } - + attachments = g_slist_reverse (attachments); - + return attachments; } @@ -606,18 +606,18 @@ e_attachment_bar_get_attachment (EAttachmentBar *bar, int id) struct _EAttachmentBarPrivate *priv; EAttachment *attachment; GSList *attachments; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + if (id == -1 || id > priv->attachments->len) return e_attachment_bar_get_selected (bar); - + attachment = priv->attachments->pdata[id]; attachments = g_slist_prepend (NULL, attachment); g_object_ref (attachment); - + return attachments; } @@ -635,11 +635,11 @@ e_attachment_bar_get_all_attachments (EAttachmentBar *bar) GSList *attachments = NULL; EAttachment *attachment; int i; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + for (i = priv->attachments->len - 1; i >= 0; i--) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) { @@ -647,7 +647,7 @@ e_attachment_bar_get_all_attachments (EAttachmentBar *bar) g_object_ref (attachment); } } - + return attachments; } @@ -659,17 +659,17 @@ e_attachment_bar_get_parts (EAttachmentBar *bar) EAttachment *attachment; GSList *parts = NULL; int i; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), NULL); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) parts = g_slist_prepend (parts, attachment->body); } - + return parts; } @@ -682,7 +682,7 @@ destroy (GtkObject *object) struct _EAttachmentBarPrivate *priv = bar->priv; EAttachment *attachment; int i; - + if ((priv = bar->priv)) { priv->batch_unref = TRUE; for (i = 0; i < priv->attachments->len; i++) { @@ -691,17 +691,17 @@ destroy (GtkObject *object) g_object_unref (attachment); } g_ptr_array_free (priv->attachments, TRUE); - + if (priv->attach) gtk_widget_destroy (priv->attach); - + if (priv->path) g_free (priv->path); - + g_free (priv); bar->priv = NULL; } - + if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -713,10 +713,10 @@ temp_save_part (CamelMimePart *part, gboolean readonly) char *tmpdir, *path, *mfilename = NULL, *utf8_mfilename = NULL; CamelStream *stream; CamelDataWrapper *wrapper; - + if (!(tmpdir = e_mkdtemp ("evolution-tmp-XXXXXX"))) return NULL; - + if (!(filename = camel_mime_part_get_filename (part))) { /* This is the default filename used for temporary file creation */ filename = _("Unknown"); @@ -727,17 +727,17 @@ temp_save_part (CamelMimePart *part, gboolean readonly) g_free (utf8_mfilename); filename = (const char *) mfilename; } - + path = g_build_filename (tmpdir, filename, NULL); g_free (tmpdir); g_free (mfilename); - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part)); if (readonly) stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0444); - else + else stream = camel_stream_fs_new_with_name (path, O_RDWR|O_CREAT|O_TRUNC, 0644); - + if (!stream) { /* TODO handle error conditions */ g_message ("DEBUG: could not open the file to write\n"); @@ -768,48 +768,48 @@ eab_drag_data_get(EAttachmentBar *bar, GdkDragContext *drag, GtkSelectionData *d int len, n, i = 0; CamelURL *url; GList *items; - + if (info) return; - + items = gnome_icon_list_get_selection (GNOME_ICON_LIST (bar)); len = g_list_length (items); - + uris = g_malloc0 (sizeof (char *) * (len + 1)); - + for ( ; items != NULL; items = items->next) { if (!((n = GPOINTER_TO_INT (items->data)) < priv->attachments->len)) continue; - + attachment = priv->attachments->pdata[n]; - + if (!attachment->is_available_local) continue; - + if (attachment->store_uri) { uris[i++] = attachment->store_uri; continue; } - + /* If we are not able to save, ignore it */ if (!(path = temp_save_part (attachment->body, FALSE))) continue; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, path); attachment->store_uri = camel_url_to_string (url, 0); camel_url_free (url); g_free (path); - + uris[i++] = attachment->store_uri; } - + uris[i] = NULL; - + gtk_selection_data_set_uris (data, uris); - + g_free (uris); - + return; } @@ -821,7 +821,7 @@ eab_button_release_event(EAttachmentBar *bar, GdkEventButton *event, gpointer du int length; GtkTargetEntry drag_types[] = { { "text/uri-list", 0, 0 }, - }; + }; if (event && event->button == 1) { selected = gnome_icon_list_get_selection(icon_list); @@ -844,20 +844,20 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm gboolean take_selected = FALSE; GtkTargetEntry drag_types[] = { { "text/uri-list", 0, 0 }, - }; + }; selected = gnome_icon_list_get_selection(icon_list); length = g_list_length (selected); if (event) { icon_number = gnome_icon_list_get_icon_at(icon_list, event->x, event->y); - if (icon_number < 0) { + if (icon_number < 0) { /* When nothing is selected, deselect all */ gnome_icon_list_unselect_all (icon_list); length = 0; selected = NULL; } - + if (event->button == 1) { /* If something is selected, then allow drag or else help to select */ if (length) @@ -866,27 +866,27 @@ eab_button_press_event(EAttachmentBar *bar, GdkEventButton *event, gpointer dumm gtk_drag_source_unset((GtkWidget *)bar); return FALSE; } - + /* If not r-click dont progress any more.*/ if (event->button != 3) return FALSE; - + /* When a r-click on something, if it is in the already selected list, consider a r-click of multiple things - * or deselect all and select only this for r-click + * or deselect all and select only this for r-click */ if (icon_number >= 0) { for (tmp = selected; tmp; tmp = tmp->next) { if (GPOINTER_TO_INT(tmp->data) == icon_number) take_selected = TRUE; } - + if (!take_selected) { gnome_icon_list_unselect_all(icon_list); gnome_icon_list_select_icon(icon_list, icon_number); } } } - + return FALSE; } @@ -899,15 +899,15 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy) CamelURL *url; char *path; GSList *p; - + if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) { p = e_attachment_bar_get_selected (bar); if (p && p->next == NULL) { attachment = p->data; - + /* Check if the file is stored already */ if (!attachment->store_uri) { - path = temp_save_part (attachment->body, TRUE); + path = temp_save_part (attachment->body, TRUE); url = camel_url_new ("file://", NULL); camel_url_set_path (url, path); attachment->store_uri = camel_url_to_string (url, 0); @@ -922,10 +922,10 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy) g_error_free (error); error = NULL; } - + ret = TRUE; } - + if (p) { g_slist_foreach (p, (GFunc) g_object_unref, NULL); g_slist_free (p); @@ -941,15 +941,15 @@ static void class_init (EAttachmentBarClass *klass) { GtkObjectClass *object_class; - + object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gnome_icon_list_get_type ()); - + object_class->destroy = destroy; - + /* Setup signals. */ - + signals[CHANGED] = g_signal_new ("changed", E_TYPE_ATTACHMENT_BAR, @@ -964,14 +964,14 @@ static void init (EAttachmentBar *bar) { struct _EAttachmentBarPrivate *priv; - + priv = g_new (struct _EAttachmentBarPrivate, 1); - + priv->attach = NULL; priv->batch_unref = FALSE; priv->attachments = g_ptr_array_new (); priv->path = NULL; - + bar->priv = priv; bar->expand = FALSE; } @@ -981,7 +981,7 @@ GType e_attachment_bar_get_type (void) { static GType type = 0; - + if (type == 0) { static const GTypeInfo info = { sizeof (EAttachmentBarClass), @@ -992,10 +992,10 @@ e_attachment_bar_get_type (void) 0, (GInstanceInitFunc) init, }; - + type = g_type_register_static (GNOME_TYPE_ICON_LIST, "EAttachmentBar", &info, 0); } - + return type; } @@ -1005,19 +1005,19 @@ e_attachment_bar_new (GtkAdjustment *adj) EAttachmentBar *new; GnomeIconList *icon_list; int icon_width, window_height; - + new = g_object_new (e_attachment_bar_get_type (), NULL); - + icon_list = GNOME_ICON_LIST (new); - + calculate_height_width (new, &icon_width, &window_height); - + gnome_icon_list_construct (icon_list, icon_width, adj, 0); - + gtk_widget_set_size_request (GTK_WIDGET (new), icon_width * 4, window_height); GTK_WIDGET_SET_FLAGS (new, GTK_CAN_FOCUS); - + gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS); gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING); gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING); @@ -1025,14 +1025,14 @@ e_attachment_bar_new (GtkAdjustment *adj) gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING); gnome_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE); - atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), + atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (new)), _("Attachment Bar")); - + g_signal_connect (new, "button_release_event", G_CALLBACK(eab_button_release_event), NULL); g_signal_connect (new, "button_press_event", G_CALLBACK(eab_button_press_event), NULL); g_signal_connect (new, "drag-data-get", G_CALLBACK(eab_drag_data_get), NULL); g_signal_connect (icon_list, "event", G_CALLBACK (eab_icon_clicked_cb), NULL); - + return GTK_WIDGET (new); } @@ -1042,10 +1042,10 @@ get_default_charset (void) GConfClient *gconf; const char *locale; char *charset; - + gconf = gconf_client_get_default (); charset = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL); - + if (!charset || charset[0] == '\0') { g_free (charset); charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL); @@ -1054,12 +1054,12 @@ get_default_charset (void) charset = NULL; } } - + g_object_unref (gconf); - + if (!charset && (locale = e_iconv_locale_charset ())) charset = g_strdup (locale); - + return charset ? charset : g_strdup ("us-ascii"); } @@ -1070,13 +1070,13 @@ attach_to_multipart (CamelMultipart *multipart, { CamelContentType *content_type; CamelDataWrapper *content; - + if (!attachment->body) return; content_type = camel_mime_part_get_content_type (attachment->body); content = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)); - + if (!CAMEL_IS_MULTIPART (content)) { if (camel_content_type_is (content_type, "text", "*")) { CamelTransferEncoding encoding; @@ -1086,21 +1086,21 @@ attach_to_multipart (CamelMultipart *multipart, const char *charset; char *buf = NULL; char *type; - + charset = camel_content_type_param (content_type, "charset"); - + stream = camel_stream_null_new (); filter_stream = camel_stream_filter_new_with_stream (stream); bestenc = camel_mime_filter_bestenc_new (CAMEL_BESTENC_GET_ENCODING); camel_stream_filter_add (filter_stream, CAMEL_MIME_FILTER (bestenc)); camel_object_unref (stream); - + camel_data_wrapper_decode_to_stream (content, CAMEL_STREAM (filter_stream)); camel_object_unref (filter_stream); - + encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_8BIT); camel_mime_part_set_encoding (attachment->body, encoding); - + if (encoding == CAMEL_TRANSFER_ENCODING_7BIT) { /* the text fits within us-ascii so this is safe */ /* FIXME: check that this isn't iso-2022-jp? */ @@ -1108,12 +1108,12 @@ attach_to_multipart (CamelMultipart *multipart, } else if (!charset) { if (!default_charset) default_charset = buf = get_default_charset (); - + /* FIXME: We should really check that this fits within the default_charset and if not find one that does and/or allow the user to specify? */ } - + if (!charset) { /* looks kinda nasty, but this is how ya have to do it */ camel_content_type_set_param (content_type, "charset", default_charset); @@ -1122,13 +1122,13 @@ attach_to_multipart (CamelMultipart *multipart, g_free (type); g_free (buf); } - + camel_object_unref (bestenc); } else if (!CAMEL_IS_MIME_MESSAGE (content)) { camel_mime_part_set_encoding (attachment->body, CAMEL_TRANSFER_ENCODING_BASE64); } } - + camel_multipart_add_part (multipart, attachment->body); } @@ -1138,12 +1138,12 @@ e_attachment_bar_to_multipart (EAttachmentBar *bar, CamelMultipart *multipart, c struct _EAttachmentBarPrivate *priv; EAttachment *attachment; int i; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); g_return_if_fail (CAMEL_IS_MULTIPART (multipart)); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (attachment->is_available_local) @@ -1156,7 +1156,7 @@ guint e_attachment_bar_get_num_attachments (EAttachmentBar *bar) { g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), 0); - + return bar->priv->attachments->len; } @@ -1166,7 +1166,7 @@ e_attachment_bar_attach (EAttachmentBar *bar, const char *file_name, const char { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); g_return_if_fail (file_name != NULL && disposition != NULL); - + add_from_file (bar, file_name, disposition); } @@ -1174,27 +1174,27 @@ void e_attachment_bar_add_attachment (EAttachmentBar *bar, EAttachment *attachment) { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + add_common (bar, attachment); } -int +int e_attachment_bar_get_download_count (EAttachmentBar *bar) { struct _EAttachmentBarPrivate *priv; EAttachment *attachment; int i, n = 0; - + g_return_val_if_fail (E_IS_ATTACHMENT_BAR (bar), 0); - + priv = bar->priv; - + for (i = 0; i < priv->attachments->len; i++) { attachment = priv->attachments->pdata[i]; if (!attachment->is_available_local) n++; } - + return n; } @@ -1204,9 +1204,9 @@ e_attachment_bar_attach_remote_file (EAttachmentBar *bar, const char *url, const EAttachment *attachment; CamelException ex; GtkWindow *parent; - + g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + if (!bar->priv->path) bar->priv->path = e_mkdtemp ("attach-XXXXXX"); @@ -1226,6 +1226,6 @@ void e_attachment_bar_attach_mime_part (EAttachmentBar *bar, CamelMimePart *part) { g_return_if_fail (E_IS_ATTACHMENT_BAR (bar)); - + add_from_mime_part (bar, part); } diff --git a/widgets/misc/e-attachment-bar.h b/widgets/misc/e-attachment-bar.h index 7c87c1287d..84b1331b3b 100644 --- a/widgets/misc/e-attachment-bar.h +++ b/widgets/misc/e-attachment-bar.h @@ -52,13 +52,13 @@ typedef struct _EAttachmentBarClass EAttachmentBarClass; struct _EAttachmentBar { GnomeIconList parent; gboolean expand; - + struct _EAttachmentBarPrivate *priv; }; struct _EAttachmentBarClass { GnomeIconListClass parent_class; - + void (* changed) (EAttachmentBar *bar); }; diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index d9ec749ebc..8aff418feb 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -86,12 +86,12 @@ finalise (GObject *object) { EAttachment *attachment = (EAttachment *) object; GtkWidget *dialog; - + if (attachment->editor_gui != NULL) { dialog = glade_xml_get_widget (attachment->editor_gui, "dialog"); g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CLOSE); } - + if (attachment->is_available_local) { camel_object_unref (attachment->body); if (attachment->pixbuf_cache != NULL) @@ -101,10 +101,10 @@ finalise (GObject *object) gnome_vfs_async_cancel(attachment->handle); g_free (attachment->description); } - + g_free (attachment->file_name); g_free (attachment->store_uri); - + G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -128,14 +128,14 @@ static void class_init (EAttachmentClass *klass) { GObjectClass *object_class; - + object_class = (GObjectClass*) klass; parent_class = g_type_class_ref (G_TYPE_OBJECT); - + object_class->finalize = finalise; klass->changed = real_changed; klass->update = real_update_attachment; - + signals[CHANGED] = g_signal_new ("changed", E_TYPE_ATTACHMENT, G_SIGNAL_RUN_FIRST, @@ -152,7 +152,7 @@ class_init (EAttachmentClass *klass) NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + } static void @@ -176,7 +176,7 @@ GType e_attachment_get_type (void) { static GType type = 0; - + if (type == 0) { static const GTypeInfo info = { sizeof (EAttachmentClass), @@ -189,10 +189,10 @@ e_attachment_get_type (void) 0, (GInstanceInitFunc) init, }; - + type = g_type_register_static (G_TYPE_OBJECT, "EAttachment", &info, 0); } - + return type; } @@ -240,7 +240,7 @@ attachment_guess_mime_type (const char *file_name) type = g_strdup (gnome_vfs_file_info_get_mime_type (info)); - if (type && strcmp (type, "text/directory") == 0 && + if (type && strcmp (type, "text/directory") == 0 && file_ext_is (file_name, ".vcf") && g_file_get_contents (file_name, &content, NULL, NULL) && content) { @@ -283,16 +283,16 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException char *mime_type; char *filename; CamelURL *url; - + g_return_val_if_fail (file_name != NULL, NULL); - + if (g_stat (file_name, &statbuf) < 0) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return NULL; } - + /* return if it's not a regular file */ if (!S_ISREG (statbuf.st_mode)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, @@ -300,21 +300,21 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException file_name); return NULL; } - + if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return NULL; } - + if ((mime_type = attachment_guess_mime_type (file_name))) { if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) { wrapper = (CamelDataWrapper *) camel_mime_message_new (); } else { wrapper = camel_data_wrapper_new (); } - + camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, mime_type); g_free (mime_type); @@ -323,17 +323,17 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream"); } - + camel_object_unref (stream); - + part = camel_mime_part_new (); camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (wrapper); - + camel_mime_part_set_disposition (part, disposition); filename = g_path_get_basename (file_name); camel_mime_part_set_filename (part, filename); - + #if 0 /* Note: Outlook 2002 is broken with respect to Content-Ids on non-multipart/related parts, so as an interoperability @@ -344,7 +344,7 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException camel_mime_part_set_content_id (part, content_id); g_free (content_id); #endif - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; new->body = part; @@ -353,12 +353,12 @@ e_attachment_new (const char *file_name, const char *disposition, CamelException new->handle = NULL; new->is_available_local = TRUE; new->file_name = filename; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, file_name); new->store_uri = camel_url_to_string (url, 0); camel_url_free (url); - + return new; } @@ -384,16 +384,16 @@ async_progress_update_cb (GnomeVFSAsyncHandle *handle, download_info->attachment->percentage = 0; g_signal_emit (download_info->attachment, signals[UPDATE], 0); } - + if (info->phase == GNOME_VFS_XFER_PHASE_COMPLETED) { CamelException ex; - + if (!info->file_size) { if (info->vfs_status == GNOME_VFS_OK) info->vfs_status = GNOME_VFS_ERROR_EOF; goto error_msg; } - + download_info->attachment->handle = NULL; camel_exception_init (&ex); e_attachment_build_remote_file (download_info->file_name, download_info->attachment, "attachment", &ex); @@ -430,21 +430,21 @@ async_progress_update_cb (GnomeVFSAsyncHandle *handle, static void download_to_local_path (GnomeVFSURI *source_uri, GnomeVFSURI *target_uri, DownloadInfo *download_info) - + { GList *source_uri_list; GList *target_uri_list; - + source_uri_list = g_list_append (NULL, source_uri); target_uri_list = g_list_append (NULL, target_uri); - + /* Callback info */ gnome_vfs_async_xfer (&download_info->attachment->handle, /* handle_return */ source_uri_list, /* source_uri_list */ target_uri_list, /* target_uri_list */ GNOME_VFS_XFER_DEFAULT, /* xfer_options */ - GNOME_VFS_XFER_ERROR_MODE_ABORT, /* error_mode */ - GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode */ + GNOME_VFS_XFER_ERROR_MODE_ABORT, /* error_mode */ + GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, /* overwrite_mode */ GNOME_VFS_PRIORITY_DEFAULT, /* priority */ (GnomeVFSAsyncXferProgressCallback) async_progress_update_cb, download_info, /* update_callback_data */ @@ -459,13 +459,13 @@ e_attachment_new_remote_file (GtkWindow *error_dlg_parent, const char *uri, cons DownloadInfo *download_info; CamelURL *url; char *base; - + g_return_val_if_fail (uri != NULL, NULL); - + url = camel_url_new (uri, NULL); base = g_path_get_basename (url->path); camel_url_free (url); - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; new->body = NULL; @@ -475,16 +475,16 @@ e_attachment_new_remote_file (GtkWindow *error_dlg_parent, const char *uri, cons new->is_available_local = FALSE; new->percentage = 0; new->file_name = g_build_filename (path, base, NULL); - + g_free (base); - + download_info = g_new (DownloadInfo, 1); download_info->attachment = new; download_info->file_name = g_strdup (new->file_name); download_info->uri = g_strdup (uri); download_info->parent = error_dlg_parent; download_to_local_path (gnome_vfs_uri_new (uri), gnome_vfs_uri_new (new->file_name), download_info); - + return new; } @@ -499,9 +499,9 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, char *mime_type; char *filename; CamelURL *url; - + g_return_if_fail (file_name != NULL); - + if (g_stat (file_name, &statbuf) == -1) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), @@ -509,7 +509,7 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_message ("Cannot attach file %s: %s\n", file_name, g_strerror (errno)); return; } - + /* return if it's not a regular file */ if (!S_ISREG (statbuf.st_mode)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, @@ -518,21 +518,21 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_message ("Cannot attach file %s: not a regular file", file_name); return; } - + if (!(stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0))) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot attach file %s: %s"), file_name, g_strerror (errno)); return; } - + if ((mime_type = attachment_guess_mime_type (file_name))) { if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) { wrapper = (CamelDataWrapper *) camel_mime_message_new (); } else { wrapper = camel_data_wrapper_new (); } - + camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, mime_type); g_free (mime_type); @@ -541,9 +541,9 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream"); } - + camel_object_unref (stream); - + part = camel_mime_part_new (); camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (wrapper); @@ -552,12 +552,12 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, camel_mime_part_set_disposition (part, "inline"); else camel_mime_part_set_disposition (part, "attachment"); - + if (!attachment->file_name) filename = g_path_get_basename (file_name); else filename = g_path_get_basename (attachment->file_name); - + camel_mime_part_set_filename (part, filename); if (attachment->description) { @@ -565,14 +565,14 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, g_free (attachment->description); attachment->description = NULL; } - + attachment->editor_gui = NULL; attachment->body = part; attachment->size = statbuf.st_size; attachment->guessed_type = TRUE; g_free (attachment->file_name); attachment->file_name = filename; - + url = camel_url_new ("file://", NULL); camel_url_set_path (url, file_name); attachment->store_uri = camel_url_to_string (url, 0); @@ -584,16 +584,16 @@ e_attachment_build_remote_file (const char *file_name, EAttachment *attachment, /** * e_attachment_new_from_mime_part: * @part: a CamelMimePart - * + * * Return value: a new EAttachment based on the mime part **/ EAttachment * e_attachment_new_from_mime_part (CamelMimePart *part) { EAttachment *new; - + g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL); - + new = g_object_new (E_TYPE_ATTACHMENT, NULL); new->editor_gui = NULL; camel_object_ref (part); @@ -602,7 +602,7 @@ e_attachment_new_from_mime_part (CamelMimePart *part) new->is_available_local = TRUE; new->size = 0; new->file_name = g_strdup (camel_mime_part_get_filename(part)); - + return new; } @@ -634,7 +634,7 @@ static void set_entry (GladeXML *xml, const char *widget_name, const char *value) { GtkEntry *entry; - + entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name)); if (entry == NULL) g_warning ("Entry for `%s' not found.", widget_name); @@ -647,7 +647,7 @@ connect_widget (GladeXML *gui, const char *name, const char *signal_name, GCallback func, gpointer data) { GtkWidget *widget; - + widget = glade_xml_get_widget (gui, name); g_signal_connect (widget, signal_name, func, data); } @@ -657,14 +657,14 @@ close_cb (GtkWidget *widget, gpointer data) { EAttachment *attachment; DialogData *dialog_data; - + dialog_data = (DialogData *) data; attachment = dialog_data->attachment; - + gtk_widget_destroy (dialog_data->dialog); g_object_unref (attachment->editor_gui); attachment->editor_gui = NULL; - + destroy_dialog_data (dialog_data); } @@ -674,16 +674,16 @@ ok_cb (GtkWidget *widget, gpointer data) DialogData *dialog_data; EAttachment *attachment; const char *str; - + dialog_data = (DialogData *) data; attachment = dialog_data->attachment; - + str = gtk_entry_get_text (dialog_data->file_name_entry); if (attachment->is_available_local) camel_mime_part_set_filename (attachment->body, str); g_free (attachment->file_name); attachment->file_name = g_strdup (str); - + str = gtk_entry_get_text (dialog_data->description_entry); if (attachment->is_available_local) { camel_mime_part_set_description (attachment->body, str); @@ -691,13 +691,13 @@ ok_cb (GtkWidget *widget, gpointer data) g_free (attachment->description); attachment->description = g_strdup (str); } - + str = gtk_entry_get_text (dialog_data->mime_type_entry); if (attachment->is_available_local) { camel_mime_part_set_content_type (attachment->body, str); camel_data_wrapper_set_mime_type(camel_medium_get_content_object(CAMEL_MEDIUM (attachment->body)), str); } - + if (attachment->is_available_local) { switch (gtk_toggle_button_get_active (dialog_data->disposition_checkbox)) { case 0: @@ -713,7 +713,7 @@ ok_cb (GtkWidget *widget, gpointer data) } else { attachment->disposition = gtk_toggle_button_get_active (dialog_data->disposition_checkbox); } - + changed (attachment); close_cb (widget, data); } @@ -737,29 +737,29 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) GtkWidget *window; char *type; char *filename; - + g_return_if_fail (E_IS_ATTACHMENT (attachment)); - + if (attachment->editor_gui != NULL) { window = glade_xml_get_widget (attachment->editor_gui, "dialog"); gdk_window_show (window->window); return; } - + filename = g_build_filename (EVOLUTION_GLADEDIR, "e-attachment.glade", NULL); editor_gui = glade_xml_new (filename, NULL, NULL); g_free (filename); - + if (editor_gui == NULL) { g_warning ("Cannot load `e-attachment.glade'"); return; } - + attachment->editor_gui = editor_gui; - + gtk_window_set_transient_for (GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")), GTK_WINDOW (gtk_widget_get_toplevel (parent))); - + dialog_data = g_new (DialogData, 1); dialog_data->attachment = attachment; dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog"); @@ -767,7 +767,7 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) dialog_data->description_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "description_entry")); dialog_data->mime_type_entry = GTK_ENTRY (glade_xml_get_widget (editor_gui, "mime_type_entry")); dialog_data->disposition_checkbox = GTK_TOGGLE_BUTTON (glade_xml_get_widget (editor_gui, "disposition_checkbox")); - + if (attachment->is_available_local && attachment->body) { set_entry (editor_gui, "file_name_entry", camel_mime_part_get_filename (attachment->body)); set_entry (editor_gui, "description_entry", camel_mime_part_get_description (attachment->body)); @@ -775,7 +775,7 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) type = camel_content_type_simple (content_type); set_entry (editor_gui, "mime_type_entry", type); g_free (type); - + disposition = camel_mime_part_get_disposition (attachment->body); gtk_toggle_button_set_active (dialog_data->disposition_checkbox, disposition && !g_ascii_strcasecmp (disposition, "inline")); @@ -788,12 +788,12 @@ e_attachment_edit (EAttachment *attachment, GtkWidget *parent) } else { set_entry (editor_gui, "mime_type_entry", ""); } - + gtk_toggle_button_set_active (dialog_data->disposition_checkbox, attachment->disposition); } - + connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data); - + /* make sure that when the parent gets hidden/closed that our windows also close */ parent = gtk_widget_get_toplevel (parent); gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback) close_cb, dialog_data, diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index 478dc07d22..3b03a0aa72 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -58,7 +58,7 @@ struct _EAttachment { gulong size; GdkPixbuf *pixbuf_cache; - + GnomeVFSAsyncHandle *handle; gboolean is_available_local; int percentage; diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index cb4c35695c..7cbfc2f958 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1,14 +1,14 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * Bolian Yin <bolian.yin@sun.com> * * Copyright 2000, 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 + * 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, @@ -389,7 +389,7 @@ e_calendar_item_init (ECalendarItem *calitem) calitem->move_selection_when_moving = TRUE; calitem->preserve_day_when_moving = FALSE; calitem->display_popup = TRUE; - + calitem->x1 = 0.0; calitem->y1 = 0.0; calitem->x2 = 0.0; @@ -548,7 +548,7 @@ e_calendar_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) item = GNOME_CANVAS_ITEM (o); calitem = E_CALENDAR_ITEM (o); - + switch (arg_id){ case ARG_YEAR: ivalue = GTK_VALUE_INT (*arg); @@ -971,11 +971,11 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, int day_index) /* we use strlen because we actually want to count bytes */ if (day_index == 6) - char_size = strlen (day); + char_size = strlen (day); else char_size = strlen (day) - strlen (g_utf8_find_next_char (day, NULL)); - pango_layout_set_text (layout, day, char_size); + pango_layout_set_text (layout, day, char_size); } static void @@ -1543,7 +1543,7 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, gdk_cairo_set_source_color (cr, &base); cairo_rectangle (cr, calitem->x1 - x, calitem->y1 - y, calitem->x2 - calitem->x1 + 1, - calitem->y2 - calitem->y1 + 1); + calitem->y2 - calitem->y1 + 1); cairo_fill (cr); cairo_restore (cr); @@ -1618,11 +1618,11 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, int day_index) /* we use strlen because we actually want to count bytes */ if (day_index == 6) - char_size = strlen (day); + char_size = strlen (day); else char_size = strlen (day) - strlen (g_utf8_find_next_char (day, NULL)); - pango_layout_set_text (layout, day, char_size); + pango_layout_set_text (layout, day, char_size); } static void @@ -1992,7 +1992,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, pango_layout_set_text (layout, buffer, num_chars); cairo_translate (cr, text_x, text_y); pango_cairo_update_layout (cr, layout); - pango_cairo_show_layout (cr, layout); + pango_cairo_show_layout (cr, layout); cairo_restore (cr); } @@ -2077,7 +2077,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gdk_cairo_set_source_color (cr, box_color); cairo_rectangle (cr, day_x , day_y, calitem->cell_width - 1, - calitem->cell_height - 1); + calitem->cell_height - 1); cairo_stroke (cr); cairo_restore (cr); } @@ -2098,7 +2098,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, digit = day_num % 10; day_x -= calitem->digit_widths[digit]; buffer[num_chars++] = digit + '0'; - + cairo_save (cr); if (fg_color) { gdk_cairo_set_source_color (cr, fg_color); @@ -2118,7 +2118,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, pango_cairo_show_layout (cr, layout); cairo_restore (cr); } - + /* See if we've reached the end of a month. */ if (day_num == days_in_month[mon]) { month_offset++; @@ -2150,7 +2150,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gdk_gc_set_foreground (fg_gc, &style->fg[GTK_STATE_NORMAL]); g_object_unref (layout); - + pango_font_metrics_unref (font_metrics); cairo_destroy (cr); } @@ -2165,35 +2165,35 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, GDate date; guint weekday, yearday; int offset, week_num; - + /* FIXME: check what happens at year boundaries. */ - + g_date_clear (&date, 1); g_date_set_dmy (&date, day, month + 1, year); - + /* This results in a value of 0 (Monday) - 6 (Sunday). (or -1 on error - oops!!) */ weekday = g_date_get_weekday (&date) - 1; - + /* Calculate the offset from the start of the week. */ offset = (calitem->week_start_day + 7 - weekday) % 7; - + /* Calculate the day of the year, from 0 to 365. */ yearday = g_date_get_day_of_year (&date) - 1; - + /* If the week starts on or after 29th December, it is week 1 of the next year, since there are 4 days in the next year. */ g_date_subtract_days (&date, offset); if (g_date_get_month (&date) == 12 && g_date_get_day (&date) >= 29) return 1; - + /* Calculate the week number, from 0. */ week_num = (yearday - offset) / 7; - + /* If the first week starts on or after Jan 5th, then we need to add 1 since the previous week will really be the first week. */ if ((yearday - offset) % 7 >= 4) week_num++; - + /* Add 1 so week numbers are from 1 to 53. */ return week_num + 1; } @@ -2549,7 +2549,7 @@ e_calendar_item_button_press (ECalendarItem *calitem, &all_week)) return FALSE; - if (event->button.button == 3 && day == -1 + if (event->button.button == 3 && day == -1 && e_calendar_item_get_display_popup (calitem)) { e_calendar_item_show_popup_menu (calitem, (GdkEventButton*) event, @@ -3077,7 +3077,7 @@ e_calendar_item_set_first_month(ECalendarItem *calitem, gint selected_day; struct tm tmp_tm = { 0 }; - old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, + old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day); /* Calculate the currently selected day */ @@ -3086,9 +3086,9 @@ e_calendar_item_set_first_month(ECalendarItem *calitem, tmp_tm.tm_mday = calitem->selection_start_day; tmp_tm.tm_isdst = -1; mktime (&tmp_tm); - + selected_day = (tmp_tm.tm_wday + 6) % 7; - + /* Make sure the selection will be displayed. */ if (calitem->selection_start_month_offset < 0 || calitem->selection_start_month_offset >= num_months) { @@ -3137,7 +3137,7 @@ e_calendar_item_get_max_days_sel (ECalendarItem *calitem) /* Set the maximum number of days selectable */ -void +void e_calendar_item_set_max_days_sel (ECalendarItem *calitem, gint days) { @@ -3147,7 +3147,7 @@ e_calendar_item_set_max_days_sel (ECalendarItem *calitem, /* Get the maximum number of days before whole weeks are selected */ -gint +gint e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) { return calitem->days_to_start_week_selection; @@ -3155,21 +3155,21 @@ e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) /* Set the maximum number of days before whole weeks are selected */ -void +void e_calendar_item_set_days_start_week_sel(ECalendarItem *calitem, gint days) { calitem->days_to_start_week_selection = days; } -gboolean +gboolean e_calendar_item_get_display_popup (ECalendarItem *calitem) { return calitem->display_popup; } -void +void e_calendar_item_set_display_popup (ECalendarItem *calitem, gboolean display) { @@ -3609,7 +3609,7 @@ e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } -void +void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem) { calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX] = widget->style->bg[GTK_STATE_SELECTED]; @@ -3671,13 +3671,13 @@ e_calendar_item_ensure_days_visible (ECalendarItem *calitem, calitem->month += (months_shown - 1); e_calendar_item_normalize_date (calitem, &calitem->year, &calitem->month); - + e_calendar_item_get_month_info (calitem, 0, 0, &first_day_offset, &days_in_month, &days_in_prev_month); - if (end_day >= E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH - + if (end_day >= E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH - first_day_offset - days_in_month) { need_update = TRUE; diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index a538395736..efd6d60a73 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -1,13 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * * Copyright 2000, 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 + * 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, @@ -78,7 +78,7 @@ typedef enum E_CALENDAR_ITEM_COLOR_SELECTION_BG_FOCUSED, E_CALENDAR_ITEM_COLOR_SELECTION_BG, E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG, - + E_CALENDAR_ITEM_COLOR_LAST } ECalendarItemColors; @@ -168,7 +168,7 @@ struct _ECalendarItem be changed when the user explicitly selects a day. */ gboolean move_selection_when_moving; - /* Whether the selection day is preserved when we move back/forward + /* Whether the selection day is preserved when we move back/forward one month. Used for the work week and week view. */ gboolean preserve_day_when_moving; diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 061fb2f8ce..3afff4bd52 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -1,13 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * Damon Chaplin <damon@ximian.com> * * Copyright 2000, 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 + * 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, diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 441973e6e9..54f35653da 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-background.c - background color for canvas. * Copyright 2001, Ximian, Inc. * @@ -96,7 +96,7 @@ ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y /* Wrong BBox's are the source of redraw nightmares */ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ecb), i2c); - + i1.x = ecb->priv->x1; i1.y = ecb->priv->y1; i2.x = ecb->priv->x2; @@ -336,7 +336,7 @@ static void ecb_realize (GnomeCanvasItem *item) { ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); - + if (GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize) GNOME_CANVAS_ITEM_CLASS (ecb_parent_class)->realize (item); @@ -346,7 +346,7 @@ ecb_realize (GnomeCanvasItem *item) gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); set_stipple (ecb, NULL, FALSE); - + ecb->priv->needs_redraw = 1; gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb)); } @@ -370,7 +370,7 @@ ecb_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int x1, x2, y1, y2; double i2c [6]; ArtPoint upper_left, lower_right, ecb_base_point; - + /* * Find out our real position after grouping */ @@ -423,7 +423,7 @@ static void ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb); - + if (GTK_WIDGET_REALIZED (item->canvas)) { gdk_gc_set_foreground (ecb->priv->gc, >K_WIDGET(item->canvas)->style->base[GTK_STATE_NORMAL]); gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb)); @@ -435,7 +435,7 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class) { GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (ecb_class); GObjectClass *object_class = G_OBJECT_CLASS (ecb_class); - + object_class->dispose = ecb_dispose; object_class->set_property = ecb_set_property; object_class->get_property = ecb_get_property; diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h index eceeede97a..94da38baf9 100644 --- a/widgets/misc/e-canvas-background.h +++ b/widgets/misc/e-canvas-background.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-background.h - background color for canvas. * Copyright 2001, Ximian, Inc. * diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index 1477bbccd7..d4ee0a1c36 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-utils.c * Copyright 2000, 2001, Ximian, Inc. * @@ -69,7 +69,7 @@ e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double { GtkAdjustment *h, *v; int dx = 0, dy = 0; - + g_return_if_fail (canvas != NULL); g_return_if_fail (GNOME_IS_CANVAS (canvas)); @@ -89,7 +89,7 @@ e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, { g_return_if_fail (item != NULL); g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); @@ -102,7 +102,7 @@ e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, doubl { GtkAdjustment *h, *v; int dx = 0, dy = 0; - + g_return_val_if_fail (canvas != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS (canvas), FALSE); @@ -123,7 +123,7 @@ e_canvas_item_area_shown (GnomeCanvasItem *item, double x1, double y1, double x2 { g_return_val_if_fail (item != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (item), FALSE); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); @@ -153,10 +153,10 @@ void e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay) { DoubsAndCanvas *dac; - + g_return_if_fail (item != NULL); g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); - + gnome_canvas_item_i2w(item, &x1, &y1); gnome_canvas_item_i2w(item, &x2, &y2); diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index 258890cbd8..d13cd35c5f 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright 2000, 2001, Ximian, Inc. * * Authors: diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index b524daf3fb..1a7b4f8221 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-vbox.c * Copyright 2000, 2001, Ximian, Inc. * @@ -72,15 +72,15 @@ e_canvas_vbox_class_init (ECanvasVboxClass *klass) klass->add_item = e_canvas_vbox_real_add_item; klass->add_item_start = e_canvas_vbox_real_add_item_start; - + object_class->set_property = e_canvas_vbox_set_property; object_class->get_property = e_canvas_vbox_get_property; object_class->dispose = e_canvas_vbox_dispose; - + /* GnomeCanvasItem method overrides */ item_class->event = e_canvas_vbox_event; item_class->realize = e_canvas_vbox_realize; - + g_object_class_install_property (object_class, PROP_WIDTH, g_param_spec_double ("width", _( "Width" ), @@ -128,7 +128,7 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, item = GNOME_CANVAS_ITEM (object); e_canvas_vbox = E_CANVAS_VBOX (object); - + switch (prop_id){ case PROP_WIDTH: case PROP_MINIMUM_WIDTH: @@ -233,7 +233,7 @@ e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event) return GNOME_CANVAS_ITEM_CLASS (e_canvas_vbox_parent_class)->event (item, event); } return return_val; - + } static void @@ -241,7 +241,7 @@ e_canvas_vbox_realize (GnomeCanvasItem *item) { if (GNOME_CANVAS_ITEM_CLASS(e_canvas_vbox_parent_class)->realize) (* GNOME_CANVAS_ITEM_CLASS(e_canvas_vbox_parent_class)->realize) (item); - + e_canvas_vbox_resize_children(item); e_canvas_item_request_reflow(item); } @@ -332,7 +332,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags ) if (max_width < item_width) max_width = item_width; list = g_list_next(list); - + for( ; list; list = g_list_next(list)) { running_height += e_canvas_vbox->spacing; @@ -349,7 +349,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags ) if (max_width < item_width) max_width = item_width; } - + } e_canvas_vbox->height = running_height; e_canvas_vbox->width = max_width; @@ -372,4 +372,4 @@ e_canvas_vbox_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item) if (E_CANVAS_VBOX_CLASS(GTK_OBJECT_GET_CLASS(e_canvas_vbox))->add_item_start) (E_CANVAS_VBOX_CLASS(GTK_OBJECT_GET_CLASS(e_canvas_vbox))->add_item_start) (e_canvas_vbox, item); } - + diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index ffd7cdbccf..d78d358095 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas-vbox.h * Copyright 2000, 2001, Ximian, Inc. * @@ -75,7 +75,7 @@ struct _ECanvasVboxClass void (* add_item_start) (ECanvasVbox *CanvasVbox, GnomeCanvasItem *item); }; -/* +/* * To be added to a CanvasVbox, an item must have the argument "width" as * a Read/Write argument and "height" as a Read Only argument. It * should also do an ECanvas parent CanvasVbox request if its size diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 387f89730b..55b19ad2a3 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas.c * Copyright 2000, 2001, Ximian, Inc. * @@ -276,7 +276,7 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event) g_return_val_if_fail (event != NULL, FALSE); canvas = GNOME_CANVAS (widget); - + full_event.key = *event; return emit_event (canvas, &full_event); diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 410037baf4..de0f0f361c 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-canvas.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 1dbe9ee01f..2b716e4622 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -174,7 +174,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_window_set_policy (GTK_WINDOW (ecde->popup_window), TRUE, TRUE, FALSE); - + frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (ecde->popup_window), frame); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); @@ -349,7 +349,7 @@ e_cell_date_edit_set_arg (GtkObject *o, gboolean bvalue; ecde = E_CELL_DATE_EDIT (o); - + switch (arg_id){ case ARG_SHOW_TIME: bvalue = GTK_VALUE_BOOL (*arg); @@ -572,7 +572,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, GtkRequisition popup_requisition; gint avail_height, screen_width, column_width, row_height; double x1, y1, wx, wy; - + gdk_window_get_origin (canvas->window, x, y); x1 = e_table_header_col_diff (eti->header, 0, view_col + 1); @@ -591,7 +591,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, x1 = wx; y1 = wy; - + *x += x1; /* The ETable positions don't include the grid lines, I think, so we add 1. */ @@ -604,9 +604,9 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, /* We'll use the entire screen width if needed, but we save space for the vertical scrollbar in case we need to show that. */ screen_width = gdk_screen_width (); - + gtk_widget_size_request (ecde->popup_window, &popup_requisition); - + /* Calculate the desired width. */ *width = popup_requisition.width; diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 57679fd589..f8336812b4 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -116,7 +116,7 @@ ecp_set_value (ECellText *cell, ETableModel *model, int col, int row, } static void -e_cell_percent_class_init (ECellPercentClass *ecpc) +e_cell_percent_class_init (ECellPercentClass *ecpc) { ECellTextClass *ectc = (ECellTextClass *) ecpc; @@ -140,7 +140,7 @@ e_cell_percent_init (ECellPercent *ecp) * interpreted as being an int. * * See ECellText for other features. - * + * * Returns: an ECell object that can be used to render numbers. */ ECell * @@ -149,6 +149,6 @@ e_cell_percent_new (const char *fontname, GtkJustification justify) ECellPercent *ecn = g_object_new (E_CELL_PERCENT_TYPE, NULL); e_cell_text_construct (E_CELL_TEXT(ecn), fontname, justify); - + return (ECell *) ecn; } diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index 9bc0200662..e1d7ea0034 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -6,7 +6,7 @@ * Copyright (C) 2003 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 + * 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, @@ -53,7 +53,7 @@ ecrc_editing_done (GtkCellEditable *editable, ECellRendererCombo *cell) return; new_text = e_combo_cell_editable_get_text (E_COMBO_CELL_EDITABLE (editable)); - + g_signal_emit_by_name (cell, "edited", cell->priv->path, new_text); g_free (cell->priv->path); cell->priv->path = NULL; @@ -84,7 +84,7 @@ ecrc_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, c } static void -ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, +ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height) { GtkWidget *btn; @@ -158,7 +158,7 @@ e_cell_renderer_combo_class_init (ECellRendererComboClass *class) { GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); GObjectClass *obj_class = G_OBJECT_CLASS (class); - + obj_class->get_property = ecrc_get_prop; obj_class->set_property = ecrc_set_prop; obj_class->finalize = ecrc_finalize; diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h index 86fdc7cb6e..6b4b161c29 100644 --- a/widgets/misc/e-cell-renderer-combo.h +++ b/widgets/misc/e-cell-renderer-combo.h @@ -6,7 +6,7 @@ * Copyright (C) 2003 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 + * 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, diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 2f1a6d1e17..3254c9d42f 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -138,7 +138,7 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) { GtkWidget *item; char *label; - + if (charset->subclass) { label = g_strdup_printf ("%s, %s (%s)", _(classnames[charset->class]), @@ -151,26 +151,26 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) } else { label = g_strdup (charset->name); } - + item = gtk_menu_item_new_with_label (label); g_object_set_data_full ((GObject *) item, "charset", charset->name, free_name ? g_free : NULL); g_free (label); - + gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", G_CALLBACK (activate), menu); - + return item; } static gboolean -add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) +add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) { ECharset charset = { NULL, E_CHARSET_UNKNOWN, NULL }; GtkWidget *item; iconv_t ic; - + ic = iconv_open ("UTF-8", new_charset); if (ic == (iconv_t)-1) { GtkWidget *window = gtk_widget_get_ancestor (other, GTK_TYPE_WINDOW); @@ -179,25 +179,25 @@ add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) return FALSE; } iconv_close (ic); - + /* Temporarily remove the "Other..." item */ g_object_ref (other); gtk_container_remove (GTK_CONTAINER (menu), other); - + /* Create new menu item */ charset.name = g_strdup (new_charset); item = add_charset (menu, &charset, TRUE); - + /* And re-add "Other..." */ gtk_menu_shell_append (GTK_MENU_SHELL (menu), other); g_object_unref (other); - + g_object_set_data_full ((GObject *) menu, "other_charset", g_strdup (new_charset), g_free); - + g_object_set_data ((GObject *) menu, "activated_item", item); select_item (GTK_MENU_SHELL (menu), item); - + return TRUE; } @@ -257,7 +257,7 @@ activate_other (GtkWidget *item, gpointer menu) gtk_entry_set_text (GTK_ENTRY (entry), old_charset); g_signal_connect (entry, "activate", G_CALLBACK (activate_entry), dialog); - + gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12); @@ -305,18 +305,18 @@ e_charset_picker_new (const char *default_charset) GtkWidget *menu, *item; int def, i; const char *locale_charset; - + g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) locale_charset = "iso-8859-1"; - + if (!default_charset) default_charset = locale_charset; for (def = 0; def < num_charsets; def++) { if (!g_ascii_strcasecmp (charsets[def].name, default_charset)) break; } - + menu = gtk_menu_new (); for (i = 0; i < num_charsets; i++) { item = add_charset (menu, &charsets[i], FALSE); @@ -325,13 +325,13 @@ e_charset_picker_new (const char *default_charset) select_item (GTK_MENU_SHELL (menu), item); } } - + /* do the Unknown/Other section */ gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_menu_item_new ()); - + if (def == num_charsets) { ECharset other = { NULL, E_CHARSET_UNKNOWN, NULL }; - + /* Add an entry for @default_charset */ other.name = g_strdup (default_charset); item = add_charset (menu, &other, TRUE); @@ -341,13 +341,13 @@ e_charset_picker_new (const char *default_charset) g_strdup (default_charset), g_free); def++; } - + item = gtk_menu_item_new_with_label (_("Other...")); g_signal_connect (item, "activate", G_CALLBACK (activate_other), menu); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - + gtk_widget_show_all (menu); - + return menu; } @@ -365,10 +365,10 @@ e_charset_picker_get_charset (GtkWidget *menu) char *charset; g_return_val_if_fail (GTK_IS_MENU (menu), NULL); - + item = gtk_menu_get_active (GTK_MENU (menu)); charset = g_object_get_data ((GObject *) item, "charset"); - + return g_strdup (charset); } @@ -471,18 +471,18 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, const char *locale_charset; GString *menuitems; int def, i; - + g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) locale_charset = "iso-8859-1"; - + if (!default_charset) default_charset = locale_charset; for (def = 0; def < num_charsets; def++) { if (!g_ascii_strcasecmp (charsets[def].name, default_charset)) break; } - + label = g_strdup (_("Ch_aracter Encoding")); encoded_label = bonobo_ui_util_encode_str (label); menuitems = g_string_new (""); @@ -490,19 +490,19 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, encoded_label); g_free (encoded_label); g_free (label); - + for (i = 0; i < num_charsets; i++) { char *command; char *charset_name, *u; - + /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (charsets[i].name, '_'))) { int extra = 1; char *s, *d; - + while ((u = strchr (u + 1, '_'))) extra++; - + d = charset_name = g_alloca (strlen (charsets[i].name) + extra + 1); s = charsets[i].name; while (*s != '\0') { @@ -514,7 +514,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { charset_name = charsets[i].name; } - + if (charsets[i].subclass) { label = g_strdup_printf ("%s, %s (%s)", _(classnames[charsets[i].class]), @@ -527,39 +527,39 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { label = g_strdup (charset_name); } - + encoded_label = bonobo_ui_util_encode_str (label); g_free (label); - + command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\"" " group=\"charset_picker\" state=\"%d\"/>\n", charsets[i].name, encoded_label, i == def); - + bonobo_ui_component_set (uic, "/commands", command, NULL); g_free (command); - + g_string_append_printf (menuitems, " <menuitem name=\"Charset-%s\" verb=\"\"/>\n", charsets[i].name); - + g_free (encoded_label); - + label = g_strdup_printf ("Charset-%s", charsets[i].name); bonobo_ui_component_add_listener (uic, label, cb, user_data); g_free (label); } - + if (def == num_charsets) { char *command; char *charset_name, *u; - + /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (default_charset, '_'))) { int extra = 1; char *s, *d; - + while ((u = strchr (u + 1, '_'))) extra++; - + d = charset_name = g_alloca (strlen (default_charset) + extra + 1); s = (char *) default_charset; while (*s != '\0') { @@ -571,31 +571,31 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } else { charset_name = (char *) default_charset; } - + label = g_strdup (charset_name); encoded_label = bonobo_ui_util_encode_str (label); g_free (label); - + command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\"" " group=\"charset_picker\" state=\"1\"/>\n", default_charset, encoded_label); - + bonobo_ui_component_set (uic, "/commands", command, NULL); g_free (command); - + g_string_append (menuitems, " <separator/>\n"); g_string_append_printf (menuitems, " <menuitem name=\"Charset-%s\" verb=\"\"/>\n", default_charset); - + g_free (encoded_label); - + label = g_strdup_printf ("Charset-%s", default_charset); bonobo_ui_component_add_listener (uic, label, cb, user_data); g_free (label); } - + g_string_append (menuitems, "</submenu>\n"); - + bonobo_ui_component_set (uic, path, menuitems->str, NULL); g_string_free (menuitems, TRUE); } diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 863d816940..6427b62480 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-colors.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index a079729c13..5b732e1299 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -130,7 +130,7 @@ paint (EComboButton *combo_button, "focus-line-width", &focus_width, "focus-padding", &focus_pad, "interior-focus", &interior_focus, - NULL); + NULL); if (GTK_WIDGET_HAS_DEFAULT (widget) && GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL) @@ -154,14 +154,14 @@ paint (EComboButton *combo_button, GTK_WIDGET_STATE (widget), shadow_type, area, widget, "button", x, y, separator_x, height); - + if (width - separator_x > 0) gtk_paint_box (widget->style, widget->window, GTK_WIDGET_STATE (widget), shadow_type, area, widget, "button", separator_x, y, width - separator_x, height); } - + if (GTK_WIDGET_HAS_FOCUS (widget)) { if (interior_focus) { x += widget->style->xthickness + focus_pad; @@ -254,7 +254,7 @@ impl_destroy (GtkObject *object) gtk_widget_destroy (priv->arrow_image); priv->arrow_image = NULL; } - + if (priv->icon != NULL) { g_object_unref (priv->icon); priv->icon = NULL; @@ -263,7 +263,7 @@ impl_destroy (GtkObject *object) g_free (priv); combo_button->priv = NULL; } - + (* GTK_OBJECT_CLASS (e_combo_button_parent_class)->destroy) (object); } @@ -304,11 +304,11 @@ impl_button_press_event (GtkWidget *widget, combo_button = E_COMBO_BUTTON (widget); priv = combo_button->priv; - if (event->type == GDK_BUTTON_PRESS && + if (event->type == GDK_BUTTON_PRESS && (event->button == 1 || event->button == 3)) { GTK_BUTTON (widget)->button_down = TRUE; - if (event->button == 3 || + if (event->button == 3 || event->x >= priv->arrow_image->allocation.x) { /* User clicked on the right side: pop up the menu. */ gtk_button_pressed (GTK_BUTTON (widget)); @@ -355,7 +355,7 @@ impl_expose_event (GtkWidget *widget, return FALSE; bin = GTK_BIN (widget); - + paint (E_COMBO_BUTTON (widget), &event->area); child_event = *event; @@ -446,7 +446,7 @@ e_combo_button_init (EComboButton *combo_button) priv = g_new (EComboButtonPrivate, 1); combo_button->priv = priv; - + priv->icon = NULL; priv->menu = NULL; priv->menu_popped_up = FALSE; @@ -457,7 +457,7 @@ void e_combo_button_pack_hbox (EComboButton *combo_button) { EComboButtonPrivate *priv; - + priv = combo_button->priv; if(priv->is_already_packed){ @@ -481,9 +481,9 @@ e_combo_button_pack_hbox (EComboButton *combo_button) gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE, GTK_WIDGET (combo_button)->style->xthickness); gtk_widget_show (priv->arrow_image); - + gtk_widget_show (priv->hbox); - + priv->is_already_packed = TRUE; } @@ -491,9 +491,9 @@ void e_combo_button_pack_vbox (EComboButton *combo_button) { EComboButtonPrivate *priv; - + priv = combo_button->priv; - + if(priv->is_already_packed){ gtk_widget_destroy (priv->hbox); } @@ -504,7 +504,7 @@ e_combo_button_pack_vbox (EComboButton *combo_button) priv->vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (priv->vbox); - + priv->icon_image = e_icon_factory_get_image (NULL, E_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (priv->vbox), priv->icon_image, TRUE, TRUE, 0); gtk_widget_show (priv->icon_image); @@ -515,14 +515,14 @@ e_combo_button_pack_vbox (EComboButton *combo_button) gtk_widget_show (priv->label); gtk_box_pack_start (GTK_BOX(priv->hbox),priv->vbox, TRUE, TRUE, 0); - + priv->arrow_image = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE, GTK_WIDGET (combo_button)->style->xthickness); gtk_widget_show (priv->arrow_image); - + gtk_widget_show (priv->hbox); - + priv->is_already_packed = TRUE; } diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 9e7794ca9f..c83525118a 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -6,7 +6,7 @@ * Copyright (C) 2003 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 + * 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, @@ -58,7 +58,7 @@ kill_popup (EComboCellEditable *ecce) gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (ecce)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (ecce)); } - + static gboolean popup_key_press_cb (GtkWidget *widget, GdkEventKey *event, EComboCellEditable *ecce) { @@ -90,19 +90,19 @@ popup_button_press_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEdita if (event->button != 1) return FALSE; - + gdk_window_get_root_origin (widget->window, &win_x, &win_y); alloc = ecce->priv->popup->allocation; rel_x = event->x_root - win_x - alloc.x; rel_y = event->y_root - win_y - alloc.y; - + if (rel_x > 0 && rel_x < alloc.width && rel_y > 0 && rel_y < alloc.height) return FALSE; - + ecce->priv->cancelled = TRUE; kill_popup (ecce); - + return FALSE; } @@ -112,8 +112,8 @@ tree_button_release_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEdit kill_popup (ecce); return TRUE; } - -static void + +static void selection_changed_cb (GtkTreeSelection *selection, EComboCellEditable *ecce) { GtkTreeModel *model; @@ -122,7 +122,7 @@ selection_changed_cb (GtkTreeSelection *selection, EComboCellEditable *ecce) if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; - + gtk_tree_model_get (model, &iter, 0, &text, -1); e_combo_cell_editable_set_text (ecce, text); g_free (text); @@ -138,7 +138,7 @@ build_popup (EComboCellEditable *ecce) GList *l; ecce->priv->popup = gtk_window_new (GTK_WINDOW_POPUP); - + g_signal_connect (ecce->priv->popup, "button-press-event", G_CALLBACK (popup_button_press_cb), ecce); g_signal_connect (ecce->priv->popup, "key-press-event", G_CALLBACK (popup_key_press_cb), ecce); @@ -154,11 +154,11 @@ build_popup (EComboCellEditable *ecce) gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, l->data, -1); } - + gtk_tree_view_set_model (ecce->priv->tree_view, model); g_object_unref (model); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (ecce->priv->tree_view)); - + gtk_tree_view_set_headers_visible (ecce->priv->tree_view, FALSE); gtk_tree_view_insert_column_with_attributes (ecce->priv->tree_view, 0, NULL, @@ -171,7 +171,7 @@ build_popup (EComboCellEditable *ecce) selection = gtk_tree_view_get_selection (ecce->priv->tree_view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); g_signal_connect (selection, "changed", G_CALLBACK (selection_changed_cb), ecce); - + gtk_widget_show (GTK_WIDGET (ecce->priv->tree_view)); } @@ -188,14 +188,14 @@ lookup_row (GList *list, const gchar *text) return result; } -static void +static void set_cursor (GtkTreeView *tree_view, gint index) { GtkTreePath *path = gtk_tree_path_new (); gtk_tree_path_append_index (path, index); gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); - + gtk_tree_path_free (path); } @@ -207,13 +207,13 @@ grab_popup (GdkWindow *popup) } static void -position_popup (EComboCellEditable *ecce, gint x, gint y, gint offset) +position_popup (EComboCellEditable *ecce, gint x, gint y, gint offset) { GtkRequisition req; gtk_widget_realize (ecce->priv->popup); gtk_widget_size_request (ecce->priv->popup, &req); - + if (req.height > gdk_screen_height () - y) { y -= (offset + req.height); if (y < 0) @@ -321,7 +321,7 @@ ecce_init (EComboCellEditable *ecce) box = gtk_hbox_new (FALSE, 0); gtk_widget_show (box); gtk_container_add (GTK_CONTAINER (ecce), box); - + ecce->priv = g_new0 (EComboCellEditablePriv, 1); entry = gtk_entry_new (); @@ -354,9 +354,9 @@ ecce_class_init (GObjectClass *klass) GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; klass->finalize = ecce_finalize; - + widget_class->grab_focus = ecce_grab_focus; - + parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass)); } @@ -364,7 +364,7 @@ GType e_combo_cell_editable_get_type (void) { static GType ecce_type = 0; - + if (!ecce_type) { static const GTypeInfo ecce_info = { sizeof (EComboCellEditableClass), @@ -380,15 +380,15 @@ e_combo_cell_editable_get_type (void) static const GInterfaceInfo cell_editable_info = { (GInterfaceInitFunc) ecce_cell_editable_init, - NULL, - NULL + NULL, + NULL }; - + ecce_type = g_type_register_static (GTK_TYPE_EVENT_BOX, "EComboCellEditable", &ecce_info, 0); - + g_type_add_interface_static (ecce_type, GTK_TYPE_CELL_EDITABLE, &cell_editable_info); } - + return ecce_type; } diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h index d8d5a1cd68..7d3b4d731b 100644 --- a/widgets/misc/e-combo-cell-editable.h +++ b/widgets/misc/e-combo-cell-editable.h @@ -6,7 +6,7 @@ * Copyright (C) 2003 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 + * 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, diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 8f231198fa..812f357fe2 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -53,7 +53,7 @@ struct _EConfigPage { struct _EConfigPageClass { GtkEventBoxClass parent_class; - + }; diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index 159c22bb42..115b6fbc26 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-cursors.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index ec6ec6fbbf..206f1d7211 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -70,7 +70,7 @@ struct _EDateEditPrivate { GtkWidget *date_entry; GtkWidget *date_button; - + GtkWidget *space; GtkWidget *time_combo; @@ -241,7 +241,7 @@ e_date_edit_get_type (void) date_edit_type = g_type_register_static (GTK_TYPE_HBOX, "EDateEdit", &date_edit_info, 0); } - + return date_edit_type; } @@ -308,7 +308,7 @@ e_date_edit_init (EDateEdit *dedit) * * Description: Creates a new #EDateEdit widget which can be used * to provide an easy to use way for entering dates and times. - * + * * Returns: a new #EDateEdit widget. */ GtkWidget * @@ -344,7 +344,7 @@ create_children (EDateEdit *dedit) atk_object_set_name (a11y, _("Date")); gtk_box_pack_start (GTK_BOX (dedit), priv->date_entry, FALSE, TRUE, 0); gtk_widget_set_size_request (priv->date_entry, 100, -1); - + g_signal_connect (priv->date_entry, "key_press_event", G_CALLBACK (on_date_entry_key_press), dedit); @@ -388,7 +388,7 @@ create_children (EDateEdit *dedit) time_store = gtk_list_store_new (1, G_TYPE_STRING); priv->time_combo = gtk_combo_box_entry_new_with_model (GTK_TREE_MODEL (time_store), 0); g_object_unref (time_store); - + /* We need to make sure labels are right-aligned, since we want digits to line up, * and with a nonproportional font, the width of a space != width of a digit. * Technically, only 12-hour format needs this, but we do it always, for consistency. */ @@ -592,7 +592,7 @@ e_date_edit_get_time (EDateEdit *dedit) struct tm tmp_tm = { 0 }; g_return_val_if_fail (E_IS_DATE_EDIT (dedit), -1); - + priv = dedit->priv; /* Try to parse any new value now. */ @@ -832,7 +832,7 @@ e_date_edit_set_time_of_day (EDateEdit *dedit, date_edit_signals [CHANGED], 0); } -void +void e_date_edit_set_date_and_time_of_day (EDateEdit *dedit, gint year, gint month, @@ -848,7 +848,7 @@ e_date_edit_set_date_and_time_of_day (EDateEdit *dedit, year - 1900, month - 1, day); time_changed = e_date_edit_set_time_internal (dedit, TRUE, FALSE, hour, minute); - + e_date_edit_update_date_entry (dedit); e_date_edit_update_time_entry (dedit); e_date_edit_update_time_combo_state (dedit); @@ -1570,7 +1570,7 @@ on_time_entry_key_press (GtkWidget *widget, { /* I'd like to use Alt+Up/Down for popping up the list, like Win32, but the combo steals any Up/Down keys, so we use Alt+Return. */ -#if 0 +#if 0 if (event->state & GDK_MOD1_MASK && (event->keyval == GDK_Up || event->keyval == GDK_Down)) { #else @@ -1630,7 +1630,7 @@ on_date_entry_focus_out (GtkEntry *entry, tmp_tm.tm_year = 0; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 0; - + e_date_edit_check_date_changed (dedit); if (!e_date_edit_date_is_valid (dedit)) { @@ -1643,7 +1643,7 @@ on_date_entry_focus_out (GtkEntry *entry, gtk_widget_destroy (msg_dialog); e_date_edit_get_date (dedit,&tmp_tm.tm_year,&tmp_tm.tm_mon,&tmp_tm.tm_mday); e_date_edit_set_date (dedit,tmp_tm.tm_year,tmp_tm.tm_mon,tmp_tm.tm_mday); - gtk_widget_grab_focus (GTK_WIDGET (entry)); + gtk_widget_grab_focus (GTK_WIDGET (entry)); return FALSE; } return FALSE; @@ -1656,7 +1656,7 @@ on_time_entry_focus_out (GtkEntry *entry, EDateEdit *dedit) { GtkWidget *msg_dialog; - + e_date_edit_check_time_changed (dedit); if (!e_date_edit_time_is_valid (dedit)) { @@ -1732,7 +1732,7 @@ e_date_edit_update_date_entry (EDateEdit *dedit) tmp_tm.tm_mday = priv->day; tmp_tm.tm_isdst = -1; - /* This is a strftime() format for a short date. + /* This is a strftime() format for a short date. %x the preferred date representation for the current locale without the time*/ e_utf8_strftime (buffer, sizeof (buffer), "%x", &tmp_tm); gtk_entry_set_text (GTK_ENTRY (priv->date_entry), buffer); diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h index 1e9aa4142c..3f8def7146 100644 --- a/widgets/misc/e-dateedit.h +++ b/widgets/misc/e-dateedit.h @@ -38,13 +38,13 @@ */ #ifndef __E_DATE_EDIT_H_ -#define __E_DATE_EDIT_H_ +#define __E_DATE_EDIT_H_ #include <time.h> #include <glib.h> #include <gtk/gtkhbox.h> #include <gtk/gtkwidget.h> - + #define E_TYPE_DATE_EDIT (e_date_edit_get_type ()) #define E_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit)) #define E_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_EDIT, EDateEditClass)) diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 3fbdd3648e..4054e4a254 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -19,7 +19,7 @@ * * Authors: * Ettore Perazzoli <ettore@ximian.com> - * Damon Chaplin <damon@ximian.com> + * Damon Chaplin <damon@ximian.com> */ #ifdef HAVE_CONFIG_H @@ -167,7 +167,7 @@ e_dropdown_button_init (EDropdownButton *dropdown_button) * @dropdown_button: A pointer to an %EDropdownButton object * @label_text: Text to display in the button * @menu: The menu to pop up when the button is pressed - * + * * Construct the @dropdown_button with the specified @label_text and the * associated @menu. **/ @@ -216,10 +216,10 @@ e_dropdown_button_construct (EDropdownButton *dropdown_button, * e_dropdown_button_new: * @label_text: Text to display in the button * @menu: The menu to pop up when the button is pressed - * + * * Create a new dropdown button. When the button is clicked, the specified * @menu will be popped up. - * + * * Return value: A pointer to the newly created %EDropdownButton. **/ GtkWidget * diff --git a/widgets/misc/e-expander.c b/widgets/misc/e-expander.c index 4c2ecdb317..7c60c28d4b 100644 --- a/widgets/misc/e-expander.c +++ b/widgets/misc/e-expander.c @@ -112,7 +112,7 @@ GType e_expander_get_type (void) { static GType expander_type = 0; - + if (!expander_type) { static const GTypeInfo expander_info = @@ -127,12 +127,12 @@ e_expander_get_type (void) 0, /* n_preallocs */ (GInstanceInitFunc) e_expander_init, }; - + expander_type = g_type_register_static (GTK_TYPE_BIN, "EExpander", &expander_info, 0); } - + return expander_type; } @@ -256,7 +256,7 @@ e_expander_init (EExpander *expander) /* ESTUFF */ priv = g_new0 (EExpanderPrivate, 1); g_object_set_data_full (G_OBJECT (expander), "e-expander-priv", priv, g_free); - + /* ESTUFF priv = E_EXPANDER_GET_PRIVATE (expander); */ GTK_WIDGET_SET_FLAGS (expander, GTK_CAN_FOCUS); @@ -281,7 +281,7 @@ e_expander_set_property (GObject *object, GParamSpec *pspec) { EExpander *expander = E_EXPANDER (object); - + switch (prop_id) { case PROP_EXPANDED: @@ -315,7 +315,7 @@ e_expander_get_property (GObject *object, EExpanderPrivate *priv; priv = E_EXPANDER_GET_PRIVATE (expander); - + switch (prop_id) { case PROP_EXPANDED: @@ -366,7 +366,7 @@ e_expander_realize (GtkWidget *widget) GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); border_width = GTK_CONTAINER (widget)->border_width; - + attributes.x = widget->allocation.x + border_width; attributes.y = widget->allocation.y + border_width; attributes.width = widget->allocation.width - 2 * border_width; @@ -393,7 +393,7 @@ e_expander_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); } - + static void e_expander_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -827,7 +827,7 @@ e_expander_button_release (GtkWidget *widget, if (event->button == 1 && priv->button_down) { g_signal_emit_by_name (expander, "activate"); - + priv->button_down = FALSE; return TRUE; } diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 121fb3c82a..e80f7747ef 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-search-bar.c * * Copyright (C) 2001 Ximian, Inc. @@ -74,10 +74,10 @@ static void full_rule_editor_response (GtkWidget *dialog, int response, void *data) { EFilterBar *efb = data; - + if (response == GTK_RESPONSE_OK) rule_context_save (efb->context, efb->userrules); - + gtk_widget_destroy (dialog); } @@ -86,19 +86,19 @@ rule_editor_response (GtkWidget *dialog, int response, void *data) { EFilterBar *efb = data; FilterRule *rule; - + if (response == GTK_RESPONSE_OK) { rule = g_object_get_data (G_OBJECT (dialog), "rule"); if (rule) { if (!filter_rule_validate (rule)) return; - + rule_context_add_rule (efb->context, rule); /* FIXME: check return */ rule_context_save (efb->context, efb->userrules); } } - + gtk_widget_destroy (dialog); } @@ -109,7 +109,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) /* the below generates a compiler warning about incompatible pointer types */ ESearchBar *esb = (ESearchBar *)efb; FilterRule *rule; - + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { rule = g_object_get_data ((GObject *) dialog, "rule"); if (rule) { @@ -117,7 +117,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) if (!filter_rule_validate (rule)) return; - + efb->current_query = rule; g_object_ref (rule); g_signal_emit_by_name (efb, "search_activated"); @@ -128,7 +128,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); e_search_bar_set_text (esb,_("Advanced Search")); gtk_widget_set_sensitive (esb->clear_button, TRUE); - + if (response == GTK_RESPONSE_APPLY) { if (!rule_context_find_rule (efb->context, rule->name, rule->source)) rule_context_add_rule (efb->context, rule); @@ -139,7 +139,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) } else { e_search_bar_set_item_id (esb, esb->last_search_option); } - + if (response != GTK_RESPONSE_APPLY) gtk_widget_destroy (dialog); } @@ -160,20 +160,20 @@ static void do_advanced (ESearchBar *esb) { EFilterBar *efb = (EFilterBar *)esb; - + d(printf("Advanced search!\n")); - + if (!efb->save_dialog && !efb->setquery) { GtkWidget *dialog, *w; FilterRule *rule; - + if (efb->current_query) rule = filter_rule_clone (efb->current_query); else { rule = filter_rule_new (); efb->current_query = rule; } - + w = filter_rule_get_widget (rule, efb->context); filter_rule_set_source (rule, FILTER_SOURCE_INCOMING); gtk_container_set_border_width (GTK_CONTAINER (w), 12); @@ -183,17 +183,17 @@ do_advanced (ESearchBar *esb) GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - + efb->save_dialog = dialog; gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - + gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12); - + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 0); - + g_object_ref (rule); g_object_set_data_full ((GObject *) dialog, "rule", rule, (GDestroyNotify) g_object_unref); @@ -202,9 +202,9 @@ do_advanced (ESearchBar *esb) g_signal_connect (dialog, "response", G_CALLBACK (rule_advanced_response), efb); g_object_weak_ref ((GObject *) dialog, (GWeakNotify) rule_editor_destroyed, efb); - + e_search_bar_set_menu_sensitive (esb, E_FILTERBAR_SAVE_ID, FALSE); - + gtk_widget_show (dialog); } } @@ -215,7 +215,7 @@ save_search_dialog (ESearchBar *esb) FilterRule *rule; char *name, *text; GtkWidget *dialog, *w; - + EFilterBar *efb = (EFilterBar *)esb; rule = filter_rule_clone (efb->current_query); @@ -224,7 +224,7 @@ save_search_dialog (ESearchBar *esb) filter_rule_set_name (rule, name); g_free (text); g_free (name); - + w = filter_rule_get_widget (rule, efb->context); filter_rule_set_source (rule, FILTER_SOURCE_INCOMING); gtk_container_set_border_width (GTK_CONTAINER (w), 12); @@ -261,14 +261,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) EFilterBar *efb = (EFilterBar *)esb; GtkWidget *dialog; GtkStyle *style; - + d(printf ("menubar activated!\n")); switch (id) { case E_FILTERBAR_EDIT_ID: if (!efb->save_dialog) { efb->save_dialog = dialog = (GtkWidget *) rule_editor_new (efb->context, FILTER_SOURCE_INCOMING, _("_Searches")); - + gtk_window_set_title (GTK_WINDOW (dialog), _("Searches")); g_signal_connect (dialog, "response", G_CALLBACK (full_rule_editor_response), efb); g_object_weak_ref ((GObject *) dialog, (GWeakNotify) rule_editor_destroyed, efb); @@ -276,9 +276,9 @@ menubar_activated (ESearchBar *esb, int id, void *data) } break; case E_FILTERBAR_SAVE_ID: - if (efb->current_query && !efb->save_dialog) + if (efb->current_query && !efb->save_dialog) save_search_dialog (esb); - + d(printf("Save menu\n")); break; case E_FILTERBAR_ADVANCED_ID: @@ -288,14 +288,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) { #if d(!)0 GString *out = g_string_new (""); - + printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name); filter_rule_build_code (efb->menu_rules->pdata[id - efb->menu_base], out); printf("query: '%s'\n", out->str); g_string_free (out, TRUE); #endif efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base]; - + efb->setquery = TRUE; e_search_bar_set_item_id (esb, E_FILTERBAR_ADVANCED_ID); efb->setquery = FALSE; @@ -307,14 +307,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text [GTK_STATE_SELECTED] )); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base [GTK_STATE_SELECTED] )); gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base [GTK_STATE_SELECTED] )); - e_search_bar_set_text (esb,_("Advanced Search")); + e_search_bar_set_text (esb,_("Advanced Search")); g_signal_emit_by_name (efb, "search_activated", NULL); efb->setquery = FALSE; } else { return; } } - + g_signal_stop_emission_by_name (esb, "menu_activated"); } @@ -324,7 +324,7 @@ option_changed (ESearchBar *esb, void *data) EFilterBar *efb = (EFilterBar *)esb; int id = e_search_bar_get_item_id (esb); char *query; - + d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search)); if (esb->scopeitem_id == E_FILTERBAR_CURRENT_MESSAGE_ID) { @@ -332,7 +332,7 @@ option_changed (ESearchBar *esb, void *data) } else { gtk_widget_set_sensitive (esb->option_button, TRUE); } - + if (efb->setquery) return; @@ -384,7 +384,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA char *source; GSList *gtksux = NULL; int num; - + /* So gtk calls a signal again if you connect to it WHILE inside a changed event. So this snot is to work around that shit fucked up situation */ for (i=0;i<rules->len;i++) @@ -402,7 +402,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA dup_item_no_subitems (&dup_item, items + i); g_array_append_vals (menu, &dup_item, 1); } - + *start = id; if (type == 0) { @@ -453,10 +453,10 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA g_slist_free_1(gtksux); gtksux = next; } - + /* always add on the advanced menu */ if (type == 1) { - ESearchBarItem sb_items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED, + ESearchBarItem sb_items[2] = { E_FILTERBAR_SEPARATOR, E_FILTERBAR_ADVANCED, /* E_FILTERBAR_SEPARATOR, E_FILTERBAR_SAVE */ }; ESearchBarItem dup_items[2]; @@ -466,11 +466,11 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA /* dup_item_no_subitems (&dup_items[3], &sb_items[3]); */ g_array_append_vals (menu, &dup_items, 2); } - + item.id = -1; item.text = NULL; g_array_append_vals (menu, &item, 1); - + return menu; } @@ -504,11 +504,11 @@ static void free_items (ESearchBarItem *items) { int i; - - for (i = 0; items[i].id != -1; i++) + + for (i = 0; items[i].id != -1; i++) g_free (items[i].text); - + g_free (items); } @@ -519,22 +519,22 @@ set_menu (ESearchBar *esb, ESearchBarItem *items) EFilterBar *efb = E_FILTER_BAR (esb); ESearchBarItem *default_items; int i, num; - + if (efb->default_items) free_items (efb->default_items); - + for (num = 0; items[num].id != -1; num++) ; - + default_items = g_new (ESearchBarItem, num + 1); for (i = 0; i < num + 1; i++) { default_items[i].text = g_strdup (items[i].text); default_items[i].id = items[i].id; default_items[i].type = items[i].type; } - + efb->default_items = default_items; - + generate_menu (esb, default_items); } @@ -543,11 +543,11 @@ set_option (ESearchBar *esb, ESearchBarItem *items) { GArray *menu; EFilterBar *efb = (EFilterBar *)esb; - + menu = build_items (esb, items, 1, &efb->option_base, efb->option_rules); ((ESearchBarClass *)parent_class)->set_option (esb, (ESearchBarItem *)menu->data); free_built_items (menu); - + e_search_bar_set_item_id (esb, efb->option_base); } @@ -556,7 +556,7 @@ context_changed (RuleContext *context, gpointer user_data) { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -566,7 +566,7 @@ context_rule_removed (RuleContext *context, FilterRule *rule, gpointer user_data { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -576,7 +576,7 @@ rule_changed (FilterRule *rule, gpointer user_data) { EFilterBar *efb = E_FILTER_BAR (user_data); ESearchBar *esb = E_SEARCH_BAR (user_data); - + /* just generate whole menu again */ generate_menu (esb, efb->default_items); } @@ -589,12 +589,12 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp { EFilterBar *efb = (EFilterBar *) object; ESearchBar *esb = E_SEARCH_BAR (object); - + switch (property_id) { case PROP_QUERY: if (efb->current_query) { GString *out = g_string_new (""); - + filter_rule_build_code (efb->current_query, out); g_value_take_string (value, out->str); g_string_free (out, FALSE); @@ -609,9 +609,9 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp int searchscope, item_id, n, view_id; xmlNodePtr root, node; xmlDocPtr doc; - + item_id = e_search_bar_get_item_id ((ESearchBar *) efb); - + doc = xmlNewDoc ((const unsigned char *)"1.0"); root = xmlNewDocNode (doc, NULL, (const unsigned char *)"state", NULL); xmlDocSetRootElement (doc, root); @@ -620,7 +620,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp if (searchscope < E_FILTERBAR_CURRENT_FOLDER_ID) item_id = esb->last_search_option; - + if (item_id == E_FILTERBAR_ADVANCED_ID) { /* advanced query, save the filterbar state */ node = xmlNewChild (root, NULL, (const unsigned char *)"filter-bar", NULL); @@ -631,12 +631,12 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf); sprintf (buf, "%d", view_id); xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); - - xmlAddChild (node, filter_rule_xml_encode (efb->current_query)); + + xmlAddChild (node, filter_rule_xml_encode (efb->current_query)); } else { /* simple query, save the searchbar state */ text = e_search_bar_get_text ((ESearchBar *) efb); - + node = xmlNewChild (root, NULL, (const unsigned char *)"search-bar", NULL); xmlSetProp (node, (const unsigned char *)"text", (unsigned char *)(text ? text : "")); sprintf (buf, "%d", item_id); @@ -647,18 +647,18 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); g_free (text); } - + xmlDocDumpMemory (doc, &xmlbuf, &n); xmlFreeDoc (doc); - + /* remap to glib memory */ text = g_malloc (n + 1); memcpy (text, (char *)xmlbuf, n); text[n] = '\0'; xmlFree (xmlbuf); - + g_value_take_string (value, text); - + break; } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -671,14 +671,14 @@ xml_get_prop_int (xmlNodePtr node, const char *prop) { char *buf; int ret; - + if ((buf = (char *)xmlGetProp (node, (unsigned char *)prop))) { ret = strtol (buf, NULL, 10); xmlFree (buf); } else { ret = -1; } - + return ret; } @@ -691,26 +691,26 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe const char *state; xmlDocPtr doc; gboolean rule_set = FALSE, is_cur_folder=FALSE; - int view_id, scope, item_id; - + int view_id, scope, item_id; + switch (property_id) { case PROP_STATE: if ((state = g_value_get_string (value))) { if (!(doc = xmlParseDoc ((unsigned char *) state))) return; - + root = doc->children; if (strcmp ((char *)root->name, "state") != 0) { xmlFreeDoc (doc); return; } - + node = root->children; while (node != NULL) { if (!strcmp ((char *)node->name, "filter-bar")) { FilterRule *rule = NULL; - + view_id = xml_get_prop_int (node, "view_id"); scope = xml_get_prop_int (node, "searchscope"); item_id = xml_get_prop_int (node, "item_id"); @@ -719,12 +719,12 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe if (scope == E_FILTERBAR_CURRENT_FOLDER_ID) is_cur_folder = TRUE; - + if ((node = node->children)) { GtkStyle *style = gtk_widget_get_default_style (); - + rule = filter_rule_new (); - if (filter_rule_xml_decode (rule, node, efb->context) != 0) { + if (filter_rule_xml_decode (rule, node, efb->context) != 0) { gtk_widget_modify_base (E_SEARCH_BAR (efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL); @@ -736,7 +736,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); - gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); g_object_set_data_full (object, "rule", rule, (GDestroyNotify) g_object_unref); } } @@ -746,31 +746,31 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe esb->block_search = TRUE; e_search_bar_set_text (esb, _("Advanced Search")); e_search_bar_set_item_menu ((ESearchBar *) efb, item_id); - e_search_bar_set_search_scope ((ESearchBar *) efb, scope); + e_search_bar_set_search_scope ((ESearchBar *) efb, scope); esb->block_search = FALSE; efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) { char *query = e_search_bar_get_text (esb); efb->config (efb, efb->current_query, item_id, query, efb->config_data); g_free (query); - + } } e_search_bar_set_viewitem_id ((ESearchBar *) efb, view_id); efb->current_query = rule; efb->setquery = TRUE; - e_search_bar_set_item_id ((ESearchBar *) efb, E_FILTERBAR_ADVANCED_ID); + e_search_bar_set_item_id ((ESearchBar *) efb, E_FILTERBAR_ADVANCED_ID); efb->setquery = FALSE; - + break; } else if (!strcmp ((char *)node->name, "search-bar")) { int subitem_id, item_id, scope, view_id; char *text; GtkStyle *style = gtk_widget_get_default_style (); - + /* set the text first (it doesn't emit a signal) */ - + /* now set the item_id and subitem_id */ item_id = xml_get_prop_int (node, "item_id"); subitem_id = xml_get_prop_int (node, "subitem_id"); @@ -791,7 +791,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe if (text && *text) { efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) - efb->config (efb, efb->current_query, item_id, text, efb->config_data); + efb->config (efb, efb->current_query, item_id, text, efb->config_data); gtk_widget_set_sensitive (esb->clear_button, TRUE); gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); @@ -799,23 +799,23 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe gtk_widget_modify_base (((ESearchBar *)efb)->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); } else { gtk_widget_modify_base (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL); e_search_bar_paint (esb); efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) - efb->config (efb, efb->current_query, item_id, "", efb->config_data); + efb->config (efb, efb->current_query, item_id, "", efb->config_data); } - + xmlFree (text); break; } - + node = node->next; } - + xmlFreeDoc (doc); } else { /* set default state */ @@ -823,16 +823,16 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe e_search_bar_set_viewitem_id ((ESearchBar *) efb, 0); e_search_bar_set_search_scope ((ESearchBar *) efb, E_FILTERBAR_CURRENT_FOLDER_ID); } - + /* we don't want to run option_changed */ efb->setquery = TRUE; g_signal_emit_by_name (efb, "search_activated", NULL); efb->setquery = FALSE; - + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; + break; } } @@ -854,15 +854,15 @@ static void dispose (GObject *object) { EFilterBar *bar; - + g_return_if_fail (object != NULL); g_return_if_fail (E_IS_FILTER_BAR (object)); - + bar = E_FILTER_BAR (object); - + if (bar->context != NULL && bar->userrules != NULL) rule_context_save (bar->context, bar->userrules); - + if (bar->menu_rules != NULL) { clear_rules(bar, bar->menu_rules); clear_rules(bar, bar->option_rules); @@ -902,24 +902,24 @@ class_init (EFilterBarClass *klass) GObjectClass *object_class = (GObjectClass *) klass; ESearchBarClass *esb_class = (ESearchBarClass *) klass; GParamSpec *pspec; - + parent_class = g_type_class_ref (e_search_bar_get_type ()); - + object_class->dispose = dispose; object_class->get_property = get_property; object_class->set_property = set_property; - + esb_class->set_menu = set_menu; esb_class->set_option = set_option; - + pspec = g_param_spec_string ("query", NULL, NULL, NULL, G_PARAM_READABLE); g_object_class_install_property (object_class, PROP_QUERY, pspec); - + pspec = g_param_spec_string ("state", NULL, NULL, NULL, G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_STATE, pspec); - + /*gtk_object_add_arg_type ("EFilterBar::query", GTK_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);*/ - + #if 0 esb_signals [QUERY_CHANGED] = gtk_signal_new ("query_changed", @@ -928,7 +928,7 @@ class_init (EFilterBarClass *klass) G_STRUCT_OFFSET (EFilterBarClass, query_changed), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - + esb_signals [MENU_ACTIVATED] = gtk_signal_new ("menu_activated", GTK_RUN_LAST, @@ -936,7 +936,7 @@ class_init (EFilterBarClass *klass) G_STRUCT_OFFSET (EFilterBarClass, menu_activated), g_cclosure_marshal_VOID__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); - + gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL); #endif } @@ -947,7 +947,7 @@ init (EFilterBar *efb) g_signal_connect (efb, "menu_activated", G_CALLBACK (menubar_activated), NULL); g_signal_connect (efb, "query_changed", G_CALLBACK (option_changed), NULL); g_signal_connect (efb, "search_activated", G_CALLBACK (option_changed), NULL); - + efb->menu_rules = g_ptr_array_new (); efb->option_rules = g_ptr_array_new (); } @@ -963,16 +963,16 @@ e_filter_bar_new (RuleContext *context, void *data) { EFilterBar *bar; - + bar = g_object_new (e_filter_bar_get_type (), NULL); e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); - + return bar; } -void +void e_filter_bar_new_construct (RuleContext *context, const char *systemrules, const char *userrules, @@ -983,18 +983,18 @@ e_filter_bar_new_construct (RuleContext *context, bar->context = context; g_object_ref (context); - + bar->config = config; bar->config_data = data; - + bar->systemrules = g_strdup (systemrules); bar->userrules = g_strdup (userrules); - + bar->all_account_search_vf = NULL; bar->account_search_vf = NULL; - + e_search_bar_construct ((ESearchBar *)bar, &item, &item); - + g_signal_connect (context, "changed", G_CALLBACK (context_changed), bar); g_signal_connect (context, "rule_removed", G_CALLBACK (context_rule_removed), bar); @@ -1004,7 +1004,7 @@ GtkType e_filter_bar_get_type (void) { static GtkType type = 0; - + if (!type) { static const GtkTypeInfo info = { "EFilterBar", @@ -1016,9 +1016,9 @@ e_filter_bar_get_type (void) /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; - + type = gtk_type_unique (e_search_bar_get_type (), &info); } - + return type; } diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 4e64e29ccd..7588517c4b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -58,18 +58,18 @@ struct _EFilterBar { ESearchBar parent; int menu_base, option_base; GPtrArray *menu_rules, *option_rules; - + ESearchBarItem *default_items; - + GtkWidget *save_dialog; /* current save dialogue (so we dont pop up multiple ones) */ FilterRule *current_query; /* as it says */ int setquery; /* true when we're setting a query directly to advanced, so dont popup the dialog */ - + RuleContext *context; char *systemrules; char *userrules; - + EFilterBarConfigRule config; void *config_data; @@ -122,7 +122,7 @@ EFilterBar *e_filter_bar_new (RuleContext *context, const char *userrules, EFilterBarConfigRule config, void *data); -void +void e_filter_bar_new_construct (RuleContext *context, const char *systemrules, const char *userrules, diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index bd94ddb4d9..3a827c430f 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -33,7 +33,7 @@ void e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu) { g_return_if_fail (GTK_IS_MENU (menu)); - + g_signal_connect (menu, "selection_done", G_CALLBACK (gtk_widget_destroy), menu); } diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index de7f6a066b..a4d0c3795f 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-gui-utils.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c index 9da22788f7..b42271fb19 100644 --- a/widgets/misc/e-hsv-utils.c +++ b/widgets/misc/e-hsv-utils.c @@ -30,22 +30,22 @@ how much you want their respective channels modified (and in what direction). if it can't do the specified modification, it does it in the oppositon direction */ void -e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v) +e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v) { gdouble h, s, v, r, g, b; r = colour->red / 65535.0f; g = colour->green / 65535.0f; b = colour->blue / 65535.0f; - + e_rgb_to_hsv (r, g, b, &h, &s, &v); - + if (h + delta_h < 0) { h -= delta_h; } else { h += delta_h; } - + if (s + delta_s < 0) { s -= delta_s; } else { @@ -59,7 +59,7 @@ e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v } e_hsv_to_rgb (h, s, v, &r, &g, &b); - + colour->red = r * 65535.0f; colour->green = g * 65535.0f; colour->blue = b * 65535.0f; diff --git a/widgets/misc/e-hsv-utils.h b/widgets/misc/e-hsv-utils.h index 186818d7f6..f76bed73f6 100644 --- a/widgets/misc/e-hsv-utils.h +++ b/widgets/misc/e-hsv-utils.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-hsv-utils.h - utilites for manipulating colours in HSV space * Copyright (C) 1995-2001 Seth Nickell, Peter Mattis, Spencer Kimball and Josh MacDonald * diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index 48a40e088e..c246edc04c 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -28,7 +28,7 @@ * Modified by the GTK+ Team and others 1997-2005. See the AUTHORS * file in the gtk+ distribution for a list of people on the GTK+ Team. * See the ChangeLog in the gtk+ distribution files for a list of changes. - * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. * */ @@ -113,9 +113,9 @@ e_icon_entry_paint (GtkWidget *widget, height -= 2 * focus_width; } - gtk_paint_flat_box (entry_widget->style, widget->window, + gtk_paint_flat_box (entry_widget->style, widget->window, GTK_WIDGET_STATE (entry_widget), GTK_SHADOW_NONE, - NULL, entry_widget, "entry_bg", + NULL, entry_widget, "entry_bg", /* FIXME: was 0, 0 in gtk_entry_expose, but I think this is correct: */ x, y, width, height); @@ -254,7 +254,7 @@ e_icon_entry_size_allocate (GtkWidget *widget, child_allocation.width, child_allocation.height); } - + child_allocation.x = container->border_width + xborder; child_allocation.y = container->border_width + yborder; child_allocation.width = MAX (allocation->width - (container->border_width + xborder) * 2, 0); @@ -350,7 +350,7 @@ e_icon_entry_pack_widget (EIconEntry *entry, } } -static void +static void set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy) { diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h index 0bdc00c94f..db3f01dc56 100644 --- a/widgets/misc/e-icon-entry.h +++ b/widgets/misc/e-icon-entry.h @@ -30,7 +30,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file in the gtk+ distribution for a list of people on the GTK+ Team. * See the ChangeLog in the gtk+ distribution files for a list of changes. - * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/. * */ diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 319c2b55ac..c15cb54817 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -234,11 +234,11 @@ set_image_from_data (EImageChooser *chooser, gdk_pixbuf_loader_write (loader, (unsigned char *)data, length, NULL); gdk_pixbuf_loader_close (loader, NULL); - + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) g_object_ref (pixbuf); - + g_object_unref (loader); if (pixbuf) { diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index 4f9d177394..ff876038ae 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -49,7 +49,7 @@ struct _EImageChooserClass /* signals */ void (*changed) (EImageChooser *chooser); - + }; GtkWidget *e_image_chooser_new (void); diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index e38d4692cc..617a92f350 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -73,7 +73,7 @@ static void el_class_init(GObjectClass *klass) { klass->finalize = el_finalise; - + ((GtkObjectClass *)klass)->destroy = el_destroy; ((GtkWidgetClass *)klass)->expose_event = el_expose_event; } @@ -101,12 +101,12 @@ e_info_label_get_type(void) /** * e_info_label_new: - * @icon: - * + * @icon: + * * Create a new info label widget. @icon is the name of the icon * (from the icon theme) to use for the icon image. - * - * Return value: + * + * Return value: **/ GtkWidget * e_info_label_new(const char *icon) @@ -114,7 +114,7 @@ e_info_label_new(const char *icon) EInfoLabel *el = g_object_new(e_info_label_get_type(), NULL); GtkWidget *image; char *name = e_icon_factory_get_icon_filename (icon, E_ICON_SIZE_MENU); - + image = gtk_image_new_from_file(name); g_free(name); gtk_misc_set_padding((GtkMisc *)image, 6, 6); @@ -128,10 +128,10 @@ e_info_label_new(const char *icon) /** * e_info_label_set_info: - * @el: - * @location: - * @info: - * + * @el: + * @location: + * @info: + * * Set the information to show on the label. @location is some * context about the current view. e.g. the folder name. If the * label is too wide, this will be truncated. diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 17c1ecbb35..758d4f960c 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -124,11 +124,11 @@ static GtkWidgetClass *parent_class; /** * e_map_get_type: - * @void: - * + * @void: + * * Registers the #EMap class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the #EMap class. **/ @@ -608,10 +608,10 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) /** * e_map_new: - * @void: - * + * @void: + * * Creates a new empty map widget. - * + * * Return value: A newly-created map widget. **/ @@ -635,7 +635,7 @@ e_map_new (void) /* These functions translate coordinates between longitude/latitude and * the image x/y offsets, using the equidistant cylindrical projection. - * + * * Longitude E <-180, 180] * Latitude E <-90, 90] */ @@ -692,7 +692,7 @@ double e_map_get_magnification (EMap *map) { EMapPrivate *priv; - + priv = map->priv; if (priv->zoom_state == E_MAP_ZOOMED_IN) return 2.0; else return 1.0; @@ -812,7 +812,7 @@ e_map_remove_point (EMap *map, EMapPoint *point) update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); repaint_point (map, point); } - + g_free (point); } @@ -878,11 +878,11 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point) if (!priv->map_render_pixbuf) return FALSE; e_map_world_to_window (map, point->longitude, point->latitude, &x, &y); - + if (x >= 0 && x < GTK_WIDGET (map)->allocation.width && y >= 0 && y < GTK_WIDGET (map)->allocation.height) return TRUE; - + return FALSE; } @@ -932,7 +932,7 @@ repaint_visible (EMap *map) area.y = 0; area.width = GTK_WIDGET (map)->allocation.width; area.height = GTK_WIDGET (map)->allocation.height; - + request_paint_area (map, &area); } @@ -1014,7 +1014,7 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) zoom, zoom, /* Scale (x, y) */ interp); } - + if (render_overlays) { /* Add points */ @@ -1056,7 +1056,7 @@ request_paint_area (EMap *view, GdkRectangle *area) if (priv->yofs + height > gdk_pixbuf_get_height (priv->map_render_pixbuf)) height = gdk_pixbuf_get_height (priv->map_render_pixbuf) - priv->yofs; - + /* We rely on the fast case always being the case, since we load and * preprocess the source pixbuf ourselves */ @@ -1148,7 +1148,7 @@ repaint_point (EMap *map, EMapPoint *point) GdkRectangle area; double px, py; - if (!e_map_point_is_in_view (map, point)) return; + if (!e_map_point_is_in_view (map, point)) return; e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); @@ -1212,7 +1212,7 @@ smooth_center_at (EMap *map, int x, int y) dx = (x < priv->xofs) ? -1 : (x > priv->xofs) ? 1 : 0; dy = (y < priv->yofs) ? -1 : (y > priv->yofs) ? 1 : 0; - + scroll_to (map, priv->xofs + dx, priv->yofs + dy); } } @@ -1564,32 +1564,32 @@ zoom_in_smooth (EMap *map) height = gdk_pixbuf_get_height (priv->map_render_pixbuf); /* Center the target point as much as possible */ - + e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); smooth_center_at (map, x + priv->xofs, y + priv->yofs); /* Render and paint a temporary map without overlays, so they don't get in * the way (look ugly) while zooming */ - + update_render_pixbuf (map, GDK_INTERP_BILINEAR, FALSE); request_paint_area (map, &area); - + /* Find out where in the area we're going to zoom to */ e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); - + /* Pre-render the zoomed-in map, so we can put it there quickly when the * blowup sequence ends */ - + priv->zoom_state = E_MAP_ZOOMED_IN; update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); - + /* Do the blowup */ - + blowup_window_area (window, priv->xofs, priv->yofs, x, y, width, height, 1.68); /* Set new scroll offsets and paint the zoomed map */ - + e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); priv->xofs = CLAMP (priv->xofs + x - area.width / 2.0, 0, E_MAP_GET_WIDTH (map) - area.width); priv->yofs = CLAMP (priv->yofs + y - area.height / 2.0, 0, E_MAP_GET_HEIGHT (map) - area.height); @@ -1673,7 +1673,7 @@ zoom_do (EMap *map) /* if (e_map_get_smooth_zoom(map)) zoom_out_smooth(map); */ zoom_out (map); } - + g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 86bade5f97..bd73f1d2de 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -39,12 +39,12 @@ struct _EMultiConfigDialogPrivate { GSList *pages; - + GtkWidget *list_e_table; ETableModel *list_e_table_model; - + GtkWidget *notebook; - + int set_page_timeout_id; int set_page_timeout_page; }; @@ -85,7 +85,7 @@ create_page_container (const char *description, vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); gtk_widget_show (widget); gtk_widget_show (vbox); @@ -248,7 +248,7 @@ canvas_realize (GtkWidget *widget, EMultiConfigDialog *dialog) { int i; int row_count; - + row_count = e_table_model_row_count (dialog->priv->list_e_table_model); for (i = 0; i < row_count; i++) { fill_in_pixbufs (dialog, i); @@ -285,9 +285,9 @@ e_multi_config_dialog_init (EMultiConfigDialog *multi_config_dialog) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (multi_config_dialog)->action_area), 12); hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); dialog_vbox = GTK_DIALOG (multi_config_dialog)->vbox; - + gtk_container_add (GTK_CONTAINER (dialog_vbox), hbox); list_e_table_model = e_table_memory_store_new (columns); @@ -336,7 +336,7 @@ e_multi_config_dialog_init (EMultiConfigDialog *multi_config_dialog) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_dialog_set_default_response (GTK_DIALOG (multi_config_dialog), GTK_RESPONSE_OK); - + gtk_window_set_policy (GTK_WINDOW (multi_config_dialog), FALSE /* allow_shrink */, diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 6dfd4873f6..1c97306032 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -30,7 +30,7 @@ #include <libedataserverui/e-source-combo-box.h> #include "e-pilot-settings.h" -struct _EPilotSettingsPrivate +struct _EPilotSettingsPrivate { GtkWidget *source; GtkWidget *secret; @@ -81,7 +81,7 @@ static void init (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + priv = g_new0 (EPilotSettingsPrivate, 1); ps->priv = priv; @@ -93,7 +93,7 @@ build_ui (EPilotSettings *ps, ESourceList *source_list) { EPilotSettingsPrivate *priv; GtkWidget *lbl; - + priv = ps->priv; gtk_table_resize (GTK_TABLE (ps), 2, 2); @@ -134,12 +134,12 @@ e_pilot_settings_new (ESourceList *source_list) { EPilotSettings *ps; EPilotSettingsPrivate *priv; - + ps = g_object_new (E_TYPE_PILOT_SETTINGS, NULL); priv = ps->priv; build_ui (ps, source_list); - + return GTK_WIDGET (ps); } @@ -147,7 +147,7 @@ ESource * e_pilot_settings_get_source (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + g_return_val_if_fail (ps != NULL, NULL); g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL); @@ -161,7 +161,7 @@ void e_pilot_settings_set_source (EPilotSettings *ps, ESource *source) { EPilotSettingsPrivate *priv; - + g_return_if_fail (ps != NULL); g_return_if_fail (E_IS_PILOT_SETTINGS (ps)); @@ -175,12 +175,12 @@ gboolean e_pilot_settings_get_secret (EPilotSettings *ps) { EPilotSettingsPrivate *priv; - + g_return_val_if_fail (ps != NULL, FALSE); g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE); priv = ps->priv; - + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->secret)); } @@ -188,7 +188,7 @@ void e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret) { EPilotSettingsPrivate *priv; - + g_return_if_fail (ps != NULL); g_return_if_fail (E_IS_PILOT_SETTINGS (ps)); diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 8e790e41ed..8cd38b9331 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -51,9 +51,9 @@ make_item (GtkMenu *menu, GtkMenuItem *item, const char *name, GtkWidget *pixmap label = gtk_label_new_with_mnemonic (name); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); - + gtk_container_add (GTK_CONTAINER (item), label); - + if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)){ gtk_widget_show (pixmap); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap); @@ -151,12 +151,12 @@ void e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *default_closure) { GtkMenu *menu; - + g_return_if_fail (menu_list != NULL); g_return_if_fail (event != NULL); - + menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, default_closure); - + e_popup_menu (menu, event); } diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 91adb76a76..88e08de05f 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-popup-menu.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 7fb79432d6..ee906a6670 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -51,7 +51,7 @@ static void e_printable_class_init (EPrintableClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - + e_printable_signals [PRINT_PAGE] = g_signal_new ("print_page", G_OBJECT_CLASS_TYPE (object_class), @@ -89,7 +89,7 @@ e_printable_class_init (EPrintableClass *klass) e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); - + e_printable_signals [WILL_FIT] = g_signal_new ("will_fit", G_OBJECT_CLASS_TYPE (object_class), @@ -100,7 +100,7 @@ e_printable_class_init (EPrintableClass *klass) G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); - klass->print_page = NULL; + klass->print_page = NULL; klass->data_left = NULL; klass->reset = NULL; klass->height = NULL; @@ -128,7 +128,7 @@ e_printable_print_page (EPrintable *e_printable, { g_return_if_fail (e_printable != NULL); g_return_if_fail (E_IS_PRINTABLE (e_printable)); - + g_signal_emit (e_printable, e_printable_signals [PRINT_PAGE], 0, context, @@ -157,7 +157,7 @@ e_printable_reset (EPrintable *e_printable) { g_return_if_fail (e_printable != NULL); g_return_if_fail (E_IS_PRINTABLE (e_printable)); - + g_signal_emit (e_printable, e_printable_signals [RESET], 0); } diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h index bc5443bc6f..b79e042d08 100644 --- a/widgets/misc/e-printable.h +++ b/widgets/misc/e-printable.h @@ -64,7 +64,7 @@ typedef struct { GtkType e_printable_get_type (void); EPrintable *e_printable_new (void); - + /* * Routines for emitting signals on the e_table */ void e_printable_print_page (EPrintable *e_printable, diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 13460b975e..9efb689b46 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -246,7 +246,7 @@ e_reflow_model_changed (EReflowModel *e_reflow_model) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); - + d(print_tabs()); d(g_print("Emitting model_changed on model 0x%p.\n", e_reflow_model)); d(depth++); @@ -269,7 +269,7 @@ e_reflow_model_comparison_changed (EReflowModel *e_reflow_model) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); - + d(print_tabs()); d(g_print("Emitting comparison_changed on model 0x%p.\n", e_reflow_model)); d(depth++); @@ -283,7 +283,7 @@ e_reflow_model_comparison_changed (EReflowModel *e_reflow_model) * @e_reflow_model: The model changed. * @position: The position the items were insert in. * @count: The number of items inserted. - * + * * Use this function to notify any views of the reflow model that a number of items have been inserted. **/ void @@ -305,7 +305,7 @@ e_reflow_model_items_inserted (EReflowModel *e_reflow_model, int position, int c * e_reflow_model_item_removed: * @e_reflow_model: The model changed. * @n: The position from which the items were removed. - * + * * Use this function to notify any views of the reflow model that an * item has been removed. **/ diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index f7fd74fd0c..07b29c4636 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow-model.h * Copyright 2000, 2001, Ximian, Inc. * @@ -55,7 +55,7 @@ typedef struct { GnomeCanvasItem *(*incarnate) (EReflowModel *etm, int n, GnomeCanvasGroup *parent); int (*compare) (EReflowModel *etm, int n1, int n2); void (*reincarnate) (EReflowModel *etm, int n, GnomeCanvasItem *item); - + /* * Signals */ diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index a8306ffbb3..86f8fa6064 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow.c * Copyright 2000, 2001, Ximian, Inc. * @@ -193,7 +193,7 @@ do_adjustment (gpointer user_data) } reflow->do_adjustment_idle_id = 0; - + return FALSE; } @@ -226,10 +226,10 @@ cursor_changed (ESelectionModel *selection, int row, int col, EReflow *reflow) NULL); } } - + if (reflow->do_adjustment_idle_id == 0) reflow->do_adjustment_idle_id = g_idle_add (do_adjustment, reflow); - + } @@ -334,7 +334,7 @@ reflow_columns (EReflow *reflow) } reflow->column_count = column_count; - reflow->columns = g_renew (int, reflow->columns, column_count); + reflow->columns = g_renew (int, reflow->columns, column_count); column_count --; for (; column_count > column_start; column_count--) { @@ -714,7 +714,7 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar item = GNOME_CANVAS_ITEM (object); reflow = E_REFLOW (object); - + switch (prop_id){ case PROP_HEIGHT: reflow->height = g_value_get_double (value); @@ -811,11 +811,11 @@ e_reflow_dispose (GObject *object) if (reflow->do_adjustment_idle_id) g_source_remove (reflow->do_adjustment_idle_id); - reflow->do_adjustment_idle_id = 0; + reflow->do_adjustment_idle_id = 0; disconnect_model (reflow); disconnect_selection (reflow); - + g_free(reflow->empty_message); reflow->empty_message = NULL; @@ -839,7 +839,7 @@ e_reflow_realize (GnomeCanvasItem *item) if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->realize) (* GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->realize) (item); - + reflow->arrow_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR); @@ -866,7 +866,7 @@ e_reflow_realize (GnomeCanvasItem *item) adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2; adjustment->page_increment = adjustment->page_size - adjustment->step_increment; gtk_adjustment_changed(adjustment); - + if (!item->canvas->aa) { } } @@ -880,7 +880,7 @@ e_reflow_unrealize (GnomeCanvasItem *item) if (!item->canvas->aa) { } - + gdk_cursor_unref (reflow->arrow_cursor); gdk_cursor_unref (reflow->default_cursor); reflow->arrow_cursor = NULL; @@ -901,7 +901,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) { EReflow *reflow; int return_val = FALSE; - + reflow = E_REFLOW (item); switch( event->type ) @@ -910,8 +910,8 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event); break; #if 0 - if (event->key.keyval == GDK_Tab || - event->key.keyval == GDK_KP_Tab || + if (event->key.keyval == GDK_Tab || + event->key.keyval == GDK_KP_Tab || event->key.keyval == GDK_ISO_Left_Tab) { int i; int count; @@ -934,7 +934,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; i++; } - + unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); if (reflow->items[unsorted] == NULL) { reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow)); @@ -951,7 +951,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) } #endif case GDK_BUTTON_PRESS: - switch(event->button.button) + switch(event->button.button) { case 1: { @@ -971,12 +971,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) reflow->start_x = reflow->which_column_dragged * (reflow->column_width + E_REFLOW_FULL_GUTTER) - E_REFLOW_DIVIDER_WIDTH / 2; reflow->temp_column_width = reflow->column_width; reflow->column_drag = TRUE; - - gnome_canvas_item_grab (item, + + gnome_canvas_item_grab (item, GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, reflow->arrow_cursor, button->time); - + reflow->previous_temp_column_width = -1; reflow->need_column_resize = TRUE; gnome_canvas_item_request_update(item); @@ -992,7 +992,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) gtk_adjustment_set_value(adjustment, new_value); } break; - case 5: + case 5: { GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas)); gdouble new_value = adjustment->value; @@ -1061,12 +1061,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor); reflow->default_cursor_shown = FALSE; } - } else + } else if ( ! reflow->default_cursor_shown ) { gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor); reflow->default_cursor_shown = TRUE; } - + } break; case GDK_ENTER_NOTIFY: @@ -1155,7 +1155,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } if (reflow->column_drag) { int start_line = e_reflow_pick_line(reflow, - gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); + gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER); running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->temp_column_width; @@ -1170,7 +1170,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, /* Compute first column to draw. */ i /= column_width + E_REFLOW_FULL_GUTTER; running_width += i * (column_width + E_REFLOW_FULL_GUTTER); - + for ( ; i < reflow->column_count; i++) { if ( running_width > x + width ) break; @@ -1181,7 +1181,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, x_rect - x, y_rect - y, width_rect - 1, - height_rect - 1); + height_rect - 1); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } @@ -1197,7 +1197,7 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->update) GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->update (item, affine, clip_path, flags); - + x0 = item->x1; y0 = item->y1; x1 = item->x2; @@ -1228,11 +1228,11 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin } else if (reflow->need_column_resize) { int x_rect, y_rect, width_rect, height_rect; int start_line = e_reflow_pick_line(reflow, - gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); + gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); gdouble running_width; int i; double column_width; - + if ( reflow->previous_temp_column_width != -1 ) { running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->previous_temp_column_width; @@ -1241,14 +1241,14 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin y_rect = E_REFLOW_BORDER_WIDTH; width_rect = E_REFLOW_DIVIDER_WIDTH; height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2); - + for ( i = 0; i < reflow->column_count; i++) { x_rect = running_width; gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } - + if ( reflow->temp_column_width != -1 ) { running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER); column_width = reflow->temp_column_width; @@ -1257,14 +1257,14 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin y_rect = E_REFLOW_BORDER_WIDTH; width_rect = E_REFLOW_DIVIDER_WIDTH; height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2); - + for ( i = 0; i < reflow->column_count; i++) { x_rect = running_width; gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } } - + reflow->previous_temp_column_width = reflow->temp_column_width; reflow->need_column_resize = FALSE; } @@ -1283,7 +1283,7 @@ e_reflow_point (GnomeCanvasItem *item, distance = GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point (item, x, y, cx, cy, actual_item); if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item) return distance; - + *actual_item = item; return 0; #if 0 @@ -1317,7 +1317,7 @@ e_reflow_reflow( GnomeCanvasItem *item, int flags ) if (reflow->need_reflow_columns) { reflow_columns (reflow); } - + old_width = reflow->width; running_width = E_REFLOW_BORDER_WIDTH; @@ -1359,7 +1359,7 @@ e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent case 2: row = er_find_item (reflow, item); if (event->button.button == 1) { - reflow->maybe_did_something = + reflow->maybe_did_something = e_selection_model_maybe_do_something(reflow->selection, row, 0, event->button.state); reflow->maybe_in_drag = TRUE; } else { @@ -1409,7 +1409,7 @@ e_reflow_class_init (EReflowClass *klass) object_class->set_property = e_reflow_set_property; object_class->get_property = e_reflow_get_property; object_class->dispose = e_reflow_dispose; - + /* GnomeCanvasItem method overrides */ item_class->event = e_reflow_event; item_class->realize = e_reflow_realize; @@ -1530,13 +1530,13 @@ e_reflow_init (EReflow *reflow) "sorter", reflow->sorter, NULL); - reflow->selection_changed_id = + reflow->selection_changed_id = g_signal_connect(reflow->selection, "selection_changed", G_CALLBACK (selection_changed), reflow); - reflow->selection_row_changed_id = + reflow->selection_row_changed_id = g_signal_connect(reflow->selection, "selection_row_changed", G_CALLBACK (selection_row_changed), reflow); - reflow->cursor_changed_id = + reflow->cursor_changed_id = g_signal_connect(reflow->selection, "cursor_changed", G_CALLBACK (cursor_changed), reflow); diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 4e47fbf900..1a11ddbddc 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-reflow.h * Copyright 2000, 2001, Ximian, Inc. * @@ -60,7 +60,7 @@ typedef struct _EReflowClass EReflowClass; struct _EReflow { GnomeCanvasGroup parent; - + /* item specific fields */ EReflowModel *model; guint model_changed_id; @@ -132,7 +132,7 @@ struct _EReflowClass void (*column_width_changed) (EReflow *reflow, double width); }; -/* +/* * To be added to a reflow, an item must have the argument "width" as * a Read/Write argument and "height" as a Read Only argument. It * should also do an ECanvas parent reflow request if its size diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index e93a532ed8..a4da8b3f79 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-search-bar.c * * Copyright (C) 2000, 2001 Ximian, Inc. @@ -130,12 +130,12 @@ verb_name_from_id (int id) static void clear_search (ESearchBar *esb) { - e_search_bar_set_text (esb, ""); + e_search_bar_set_text (esb, ""); esb->block_search = TRUE; if (esb->item_id < 0) - e_search_bar_set_item_id (esb, esb->last_search_option); + e_search_bar_set_item_id (esb, esb->last_search_option); e_search_bar_set_viewitem_id (esb, 0); - esb->block_search = FALSE; + esb->block_search = FALSE; emit_search_activated (esb); } @@ -218,10 +218,10 @@ search_now_verb_cb (BonoboUIComponent *ui_component, } else { gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); } - + emit_search_activated (esb); } @@ -238,7 +238,7 @@ clear_verb_cb (BonoboUIComponent *ui_component, gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); clear_search (esb); - gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); + gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_grab_focus (esb->entry); } @@ -293,7 +293,7 @@ get_selected_item_label (GtkWidget *menu) item = gtk_menu_get_active ((GtkMenu *)menu); label = gtk_bin_get_child ((GtkBin *)item); - if (GTK_IS_LABEL (label)) + if (GTK_IS_LABEL (label)) text = gtk_label_get_text ((GtkLabel *)label); return text; @@ -312,7 +312,7 @@ entry_focus_in_cb (GtkWidget *widget, if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } return FALSE; } @@ -327,7 +327,7 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) text = gtk_entry_get_text (GTK_ENTRY (widget)); if (text && *text) return FALSE; - + if (!GTK_WIDGET_SENSITIVE (esb->option_button)) { menu_widget = esb->scopeoption_menu; text = g_object_get_data (G_OBJECT(gtk_menu_get_active ( GTK_MENU (esb->scopeoption_menu))),"string"); @@ -335,8 +335,8 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) return FALSE; else /* no query in search entry .. so set the current option */ text = get_selected_item_label (menu_widget); - - + + if (text && *text) { gchar *t; @@ -350,7 +350,7 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) g_free (t); gtk_widget_set_sensitive (esb->clear_button, FALSE); } - + return FALSE; } @@ -376,16 +376,16 @@ entry_activated_cb (GtkWidget *widget, GtkStyle *style = gtk_widget_get_default_style (); if (text && *text) { - gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); - gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); } else { gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); } - + emit_search_activated (esb); } @@ -398,11 +398,11 @@ entry_changed_cb (GtkWidget *widget, entry_style = gtk_widget_get_style (esb->entry); default_style = gtk_widget_get_default_style (); - + if (text && *text) - if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) + if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) gtk_widget_set_sensitive (esb->clear_button, FALSE); - else + else gtk_widget_set_sensitive (esb->clear_button, TRUE); else gtk_widget_set_sensitive (esb->clear_button, FALSE); @@ -426,7 +426,7 @@ viewitem_activated_cb(GtkWidget *widget, ESearchBar *esb) if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } esb->block_search = TRUE; emit_search_activated (esb); @@ -449,14 +449,14 @@ scopeitem_activated_cb(GtkWidget *widget, ESearchBar *esb) /* If the text is grayed, Its not the query string */ if (gdk_color_equal (&(entry_style->text[GTK_STATE_NORMAL]), &(default_style->text[GTK_STATE_INSENSITIVE]))) { - gtk_widget_grab_focus (esb->entry); + gtk_widget_grab_focus (esb->entry); gtk_entry_set_text (GTK_ENTRY (esb->entry), ""); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); - } + } - esb->block_search = TRUE; + esb->block_search = TRUE; emit_search_activated (esb); - esb->block_search = FALSE; + esb->block_search = FALSE; } static void @@ -465,7 +465,7 @@ option_activated_cb (GtkWidget *widget, { int id; const char *text; - + id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "EsbItemId")); e_search_bar_set_item_id (esb, id); @@ -477,7 +477,7 @@ option_activated_cb (GtkWidget *widget, t = g_strdup_printf ("%s: %s\n%s", _("Search"), text, _("Click here to change the search type")); else t = g_strdup_printf ("%s: %s", _("Search"), _("Click here to change the search type")); - + gtk_tooltips_set_tip (esb->tooltips, esb->option_button, t, "Search type"); g_free (t); } @@ -517,12 +517,12 @@ entry_key_press_cb (GtkWidget *widget, GdkEventKey *key_event, ESearchBar *esb) { - if (((key_event->state & gtk_accelerator_get_default_mod_mask ()) == + if (((key_event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_MOD1_MASK) && (key_event->keyval == GDK_Down)) { option_button_clicked_cb (NULL, NULL, esb); return TRUE; } - + return FALSE; } @@ -571,17 +571,17 @@ append_xml_menu_item (GString *xml, const char *accelerator) { char *encoded_label; - + encoded_label = bonobo_ui_util_encode_str (label); g_string_append_printf (xml, "<menuitem name=\"%s\" verb=\"%s\" label=\"%s\"", name, verb, encoded_label); g_free (encoded_label); - + if (accelerator != NULL) g_string_append_printf (xml, " accel=\"%s\"", accelerator); if (stock != NULL) g_string_append_printf (xml, " pixtype=\"stock\" pixname=\"%s\"", stock); - + g_string_append (xml, "/>"); } @@ -590,7 +590,7 @@ remove_bonobo_menus (ESearchBar *esb) { if (bonobo_ui_component_get_container (esb->ui_component) == CORBA_OBJECT_NIL) return; - + bonobo_ui_component_rm (esb->ui_component, "/menu/SearchPlaceholder", NULL); } @@ -601,37 +601,37 @@ setup_bonobo_menus (ESearchBar *esb) GSList *p; char *verb_name; char *encoded_title; - + xml = g_string_new (""); - + encoded_title = bonobo_ui_util_encode_str (_("_Search")); g_string_append_printf (xml, "<submenu name=\"Search\" label=\"%s\">", encoded_title); g_free (encoded_title); - + g_string_append (xml, "<placeholder name=\"SearchBar\">"); - + append_xml_menu_item (xml, "FindNow", _("_Find Now"), "gtk-find", "ESearchBar:FindNow", NULL); append_xml_menu_item (xml, "Clear", _("_Clear"), "gtk-clear", "ESearchBar:Clear", "*Control**Shift*q"); - + for (p = esb->menu_items; p != NULL; p = p->next) { const ESearchBarItem *item; - + item = (const ESearchBarItem *) p->data; - + verb_name = verb_name_from_id (item->id); bonobo_ui_component_add_verb (esb->ui_component, verb_name, search_verb_cb, esb); - + if (item->text == NULL) g_string_append (xml, "<separator/>"); else append_xml_menu_item (xml, verb_name, item->text, NULL, verb_name, NULL); - + g_free (verb_name); } - + g_string_append (xml, "</placeholder>"); g_string_append (xml, "</submenu>"); - + remove_bonobo_menus (esb); bonobo_ui_component_set (esb->ui_component, "/menu/SearchPlaceholder", xml->str, NULL); @@ -696,7 +696,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) GSList *group = NULL; int i; - if (esb->option_menu) + if (esb->option_menu) gtk_widget_destroy (esb->option_menu); esb->option_menu = menu = gtk_menu_new (); @@ -715,7 +715,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) item = gtk_menu_item_new_with_label (str); break; case ESB_ITEMTYPE_CHECK: - item = gtk_check_menu_item_new_with_label (str); + item = gtk_check_menu_item_new_with_label (str); break; case ESB_ITEMTYPE_RADIO: item = gtk_radio_menu_item_new_with_label (group, str); @@ -796,7 +796,7 @@ static void impl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ESearchBar *esb = E_SEARCH_BAR(object); - + switch (prop_id) { case PROP_ITEM_ID: e_search_bar_set_item_id (esb, g_value_get_int (value)); @@ -805,7 +805,7 @@ impl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp case PROP_TEXT: e_search_bar_set_text (esb, g_value_get_string (value)); break; - + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -816,7 +816,7 @@ static void impl_dispose (GObject *object) { ESearchBar *esb = E_SEARCH_BAR (object); - + g_return_if_fail (object != NULL); g_return_if_fail (E_IS_SEARCH_BAR (object)); @@ -835,14 +835,14 @@ impl_dispose (GObject *object) g_object_unref (esb->suboption); esb->suboption = NULL; } - + if (esb->pending_activate) { g_source_remove (esb->pending_activate); esb->pending_activate = 0; } free_menu_items (esb); - + if (G_OBJECT_CLASS (parent_class)->dispose) G_OBJECT_CLASS (parent_class)->dispose (object); } @@ -852,15 +852,15 @@ static void class_init (ESearchBarClass *klass) { GObjectClass *object_class; - + object_class = G_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_hbox_get_type ()); - + object_class->set_property = impl_set_property; object_class->get_property = impl_get_property; object_class->dispose = impl_dispose; - + klass->set_menu = set_menu; klass->set_option = set_option; @@ -871,13 +871,13 @@ class_init (ESearchBarClass *klass) 0, 0, 0, G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION)); - g_object_class_install_property (object_class, PROP_TEXT, + g_object_class_install_property (object_class, PROP_TEXT, g_param_spec_string ("text", _("Text"), /*_( */"XXX blurb" /*)*/, NULL, G_PARAM_READWRITE)); - + esb_signals [QUERY_CHANGED] = g_signal_new ("query_changed", G_OBJECT_CLASS_TYPE (object_class), @@ -886,7 +886,7 @@ class_init (ESearchBarClass *klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + esb_signals [MENU_ACTIVATED] = g_signal_new ("menu_activated", G_OBJECT_CLASS_TYPE (object_class), @@ -912,7 +912,7 @@ class_init (ESearchBarClass *klass) G_STRUCT_OFFSET (ESearchBarClass, search_cleared), NULL, NULL, g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_NONE, 0); } static void @@ -924,7 +924,7 @@ init (ESearchBar *esb) esb->option = NULL; esb->entry = NULL; esb->suboption = NULL; - + esb->option_menu = NULL; esb->suboption_menu = NULL; esb->option_button = NULL; @@ -1018,7 +1018,7 @@ e_search_bar_construct (ESearchBar *search_bar, gtk_box_pack_start (GTK_BOX(search_bar), search_bar->viewoption_box, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); /* Search entry */ hbox = gtk_hbox_new (FALSE, 0); @@ -1049,7 +1049,7 @@ e_search_bar_construct (ESearchBar *search_bar, gtk_box_pack_end (GTK_BOX(hbox), search_bar->scopeoption_box, FALSE, FALSE, 0); gtk_widget_hide (search_bar->scopeoption_box); - + gtk_box_pack_end (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -1057,7 +1057,7 @@ e_search_bar_construct (ESearchBar *search_bar, e_search_bar_set_menu (search_bar, menu_items); e_search_bar_set_option (search_bar, option_items); - /* + /* * If the default choice for the option menu has subitems, then we need to * activate the search immediately. However, the developer won't have * connected to the activated signal until after the object is constructed, @@ -1073,7 +1073,7 @@ e_search_bar_set_menu (ESearchBar *search_bar, ESearchBarItem *menu_items) { g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + ((ESearchBarClass *) GTK_OBJECT_GET_CLASS (search_bar))->set_menu (search_bar, menu_items); } @@ -1082,7 +1082,7 @@ e_search_bar_add_menu (ESearchBar *search_bar, ESearchBarItem *menu_item) { g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + set_menu (search_bar, menu_item); } @@ -1092,7 +1092,7 @@ e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items) g_return_if_fail (search_bar != NULL); g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); g_return_if_fail (option_items != NULL); - + ((ESearchBarClass *) GTK_OBJECT_GET_CLASS (search_bar))->set_option (search_bar, option_items); } @@ -1108,18 +1108,18 @@ e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc * @option_id: Identifier of the main option menu item under which the subitems * are to be set. * @subitems: Array of subitem information. - * + * * Sets the items for the secondary option menu of a search bar. **/ -void +void e_search_bar_set_viewoption_menu (ESearchBar *search_bar, GtkWidget *menu) { - if (search_bar->viewoption_menu != NULL) + if (search_bar->viewoption_menu != NULL) gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->viewoption)); - - search_bar->viewoption_menu = menu; - gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->viewoption), search_bar->viewoption_menu); + + search_bar->viewoption_menu = menu; + gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->viewoption), search_bar->viewoption_menu); g_signal_connect (search_bar->viewoption_menu, "selection-done", @@ -1143,7 +1143,7 @@ e_search_bar_get_selected_viewitem (ESearchBar *search_bar) * @option_id: Identifier of the main option menu item under which the subitems * are to be set. * @subitems: Array of subitem information. - * + * * Sets the items for the secondary option menu of a search bar. **/ void @@ -1195,7 +1195,7 @@ e_search_bar_set_viewoption (ESearchBar *search_bar, int option_id, ESearchBarIt * @search_bar: A search bar. * are to be set. * @scopeitems: Array of scope information. - * + * * Sets the items for the search scope option menu of a search bar. **/ void @@ -1204,7 +1204,7 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems GtkWidget *menu; GtkWidget *menu_item; gint i; - + gtk_widget_show (search_bar->scopeoption_box); if (search_bar->scopeoption_menu != NULL) { gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->scopeoption)); @@ -1218,7 +1218,7 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems char *str; str = e_str_without_underscores (_(scopeitems[i].text)); menu_item = gtk_menu_item_new_with_label (str); - g_object_set_data_full (G_OBJECT (menu_item), "string",str, g_free); + g_object_set_data_full (G_OBJECT (menu_item), "string",str, g_free); } else { menu_item = gtk_menu_item_new (); gtk_widget_set_sensitive (menu_item, FALSE); @@ -1241,19 +1241,19 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems /** * e_search_bar_set_scopeoption_menu: * @search_bar: A search bar. - * @menu: the scope option menu + * @menu: the scope option menu * * Sets the items for the secondary option menu of a search bar. **/ -void +void e_search_bar_set_scopeoption_menu (ESearchBar *search_bar, GtkMenu *menu) { - if (search_bar->scopeoption_menu != NULL) + if (search_bar->scopeoption_menu != NULL) gtk_option_menu_remove_menu (GTK_OPTION_MENU (search_bar->scopeoption)); - - search_bar->scopeoption_menu = GTK_WIDGET (menu); - gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->scopeoption), search_bar->scopeoption_menu); + + search_bar->scopeoption_menu = GTK_WIDGET (menu); + gtk_option_menu_set_menu (GTK_OPTION_MENU (search_bar->scopeoption), search_bar->scopeoption_menu); g_signal_connect (search_bar->scopeoption_menu, "selection-done", @@ -1268,11 +1268,11 @@ e_search_bar_new (ESearchBarItem *menu_items, GtkWidget *widget; g_return_val_if_fail (option_items != NULL, NULL); - + widget = g_object_new (e_search_bar_get_type (), NULL); - + e_search_bar_construct (E_SEARCH_BAR (widget), menu_items, option_items); - + return widget; } @@ -1340,9 +1340,9 @@ void e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->viewoption_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1356,16 +1356,16 @@ e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) * e_search_bar_set_item_id: * @search_bar: A search bar. * @id: Identifier of the item to set. - * + * * Sets the active item in the options menu of a search bar. **/ void e_search_bar_set_item_id (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->option_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1387,11 +1387,11 @@ e_search_bar_set_item_menu (ESearchBar *search_bar, int id) int row; GtkWidget *item; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->option_menu, id, "EsbItemId", &item); - if (row == -1) + if (row == -1) return; - + gtk_menu_set_active ((GtkMenu *)search_bar->option_menu, row); if (id>=0) gtk_check_menu_item_set_active ((GtkCheckMenuItem *)item, TRUE); @@ -1401,20 +1401,20 @@ e_search_bar_set_item_menu (ESearchBar *search_bar, int id) * e_search_bar_set_search_scope: * @search_bar: A search bar. * @id: Identifier of the item to set. - * + * * Sets the active item in the options menu of a search bar. **/ void e_search_bar_set_search_scope (ESearchBar *search_bar, int id) { int row; - + g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + row = find_id (search_bar->scopeoption_menu, id, "EsbItemId", NULL); if (row == -1) return; - + search_bar->scopeitem_id = id; gtk_option_menu_set_history (GTK_OPTION_MENU (search_bar->scopeoption), row); @@ -1426,9 +1426,9 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, int id) /** * e_search_bar_get_item_id: * @search_bar: A search bar. - * + * * Queries the currently selected item in the options menu of a search bar. - * + * * Return value: Identifier of the selected item in the options menu. **/ int @@ -1439,7 +1439,7 @@ e_search_bar_get_item_id (ESearchBar *search_bar) g_return_val_if_fail (search_bar != NULL, -1); g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1); - + menu_item = gtk_menu_get_active (GTK_MENU (search_bar->option_menu)); item_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId")); search_bar->item_id = item_id; @@ -1450,9 +1450,9 @@ e_search_bar_get_item_id (ESearchBar *search_bar) /** * e_search_bar_get_search_scope: * @search_bar: A search bar. - * + * * Queries the currently selected search type in the options menu of a search bar. - * + * * Return value: Identifier of the selected item in the options menu. **/ int @@ -1475,9 +1475,9 @@ e_search_bar_get_search_scope (ESearchBar *search_bar) /** * e_search_bar_get_viewitem_id: * @search_bar: A search bar. - * + * * Queries the currently selected item in the viewoptions menu of a search bar. - * + * * Return value: Identifier of the selected item in the viewoptions menu. * If the search bar currently contains an entry rather than a a viewoption menu, * a value less than zero is returned. @@ -1490,7 +1490,7 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar) g_return_val_if_fail (search_bar != NULL, -1); g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1); - + menu_item = gtk_menu_get_active (GTK_MENU (search_bar->viewoption_menu)); viewitem_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId")); @@ -1504,7 +1504,7 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar) * @search_bar: A search bar. * @item_id: Identifier of the item to set. * @subitem_id: Identifier of the subitem to set. - * + * * Sets the item and subitem ids for a search bar. This is intended to switch * to an item that has subitems. **/ @@ -1543,9 +1543,9 @@ e_search_bar_set_text (ESearchBar *search_bar, const char *text) /** * e_search_bar_get_text: * @search_bar: A search bar. - * + * * Queries the text of the entry line in a search bar. - * + * * Return value: The text string that is in the entry line of the search bar. * This must be freed using g_free(). If a suboption menu is active instead * of an entry, NULL is returned. diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 12f0129b4e..7c4144ce2f 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -69,12 +69,12 @@ struct _ESearchBar BonoboUIComponent *ui_component; GSList *menu_items; - + /* item specific fields */ GtkWidget *option; GtkWidget *entry; GtkWidget *suboption; /* an option menu for the choices associated with some options */ - + /* PRIVATE */ GtkWidget *dropdown_holder; /* holds the dropdown */ GtkWidget *option_menu; @@ -143,8 +143,8 @@ void e_search_bar_add_menu (ESearchBar *search_bar, void e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items); void e_search_bar_paint (ESearchBar *search_bar); -void e_search_bar_set_viewoption (ESearchBar *search_bar, - int option_id, +void e_search_bar_set_viewoption (ESearchBar *search_bar, + int option_id, ESearchBarItem *subitems); void e_search_bar_set_menu_sensitive (ESearchBar *search_bar, diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index ffb3c8dc94..ed846e7711 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -70,7 +70,7 @@ e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int cou } else if (esma->cursor_row < 0) { esma->cursor_row = -1; } - if (esma->cursor_row >= 0) + if (esma->cursor_row >= 0) e_bit_array_change_one_row(esma->eba, esma->cursor_row, TRUE); esma->selected_row = -1; @@ -177,7 +177,7 @@ esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp } } -/** +/** * e_selection_model_is_row_selected * @selection: #ESelectionModel to check * @n: The row to check @@ -197,7 +197,7 @@ esma_is_row_selected (ESelectionModel *selection, return FALSE; } -/** +/** * e_selection_model_foreach * @selection: #ESelectionModel to traverse * @callback: The callback function to call back. @@ -206,7 +206,7 @@ esma_is_row_selected (ESelectionModel *selection, * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -static void +static void esma_foreach (ESelectionModel *selection, EForeachFunc callback, gpointer closure) @@ -216,7 +216,7 @@ esma_foreach (ESelectionModel *selection, e_bit_array_foreach(esma->eba, callback, closure); } -/** +/** * e_selection_model_clear * @selection: #ESelectionModel to clear * @@ -241,7 +241,7 @@ esma_clear(ESelectionModel *selection) #define PART(x,n) (((x) & (0x01010101 << n)) >> n) #define SECTION(x, n) (((x) >> (n * 8)) & 0xff) -/** +/** * e_selection_model_selected_count * @selection: #ESelectionModel to count * @@ -259,7 +259,7 @@ esma_selected_count (ESelectionModel *selection) return 0; } -/** +/** * e_selection_model_select_all * @selection: #ESelectionModel to select all * @@ -284,7 +284,7 @@ esma_select_all (ESelectionModel *selection) e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), 0, 0); } -/** +/** * e_selection_model_invert_selection * @selection: #ESelectionModel to invert * @@ -299,7 +299,7 @@ esma_invert_selection (ESelectionModel *selection) e_selection_model_array_confirm_row_count(esma); e_bit_array_invert_selection(esma->eba); - + esma->cursor_col = -1; esma->cursor_row = -1; esma->selection_start_row = 0; @@ -376,7 +376,7 @@ esma_real_select_single_row (ESelectionModel *selection, int row) ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); - + e_bit_array_select_single_row(esma->eba, row); esma->selection_start_row = row; @@ -538,14 +538,14 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass) klass->get_row_count = NULL ; - g_object_class_install_property (object_class, PROP_CURSOR_ROW, + g_object_class_install_property (object_class, PROP_CURSOR_ROW, g_param_spec_int ("cursor_row", _("Cursor Row"), /*_( */"XXX blurb" /*)*/, 0, G_MAXINT, 0, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_CURSOR_COL, + g_object_class_install_property (object_class, PROP_CURSOR_COL, g_param_spec_int ("cursor_col", _("Cursor Column"), /*_( */"XXX blurb" /*)*/, diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 0635ce6715..e0fcb2221f 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model-array.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index c6d6288fa5..46b480b94c 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -48,7 +48,7 @@ e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass) G_DEFINE_TYPE (ESelectionModelSimple, e_selection_model_simple, e_selection_model_array_get_type()) -/** +/** * e_selection_model_simple_new * * This routine creates a new #ESelectionModelSimple. diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 5b27dc9c0b..978289cab4 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model-simple.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 786e0bd52b..230e3550a5 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -105,7 +105,7 @@ static void esm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ESelectionModel *esm = E_SELECTION_MODEL (object); - + switch (prop_id){ case PROP_SORTER: drop_sorter(esm); @@ -205,14 +205,14 @@ e_selection_model_class_init (ESelectionModelClass *klass) klass->move_selection_end = NULL; klass->set_selection_end = NULL; - g_object_class_install_property (object_class, PROP_SORTER, + g_object_class_install_property (object_class, PROP_SORTER, g_param_spec_object ("sorter", _("Sorter"), /*_( */"XXX blurb" /*)*/, E_SORTER_TYPE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_SELECTION_MODE, + g_object_class_install_property (object_class, PROP_SELECTION_MODE, g_param_spec_int ("selection_mode", _("Selection Mode"), /*_( */"XXX blurb" /*)*/, @@ -220,7 +220,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) GTK_SELECTION_SINGLE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_CURSOR_MODE, + g_object_class_install_property (object_class, PROP_CURSOR_MODE, g_param_spec_int ("cursor_mode", _("Cursor Mode"), /*_( */"XXX blurb" /*)*/, @@ -229,7 +229,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_PARAM_READWRITE)); } -/** +/** * e_selection_model_is_row_selected * @selection: #ESelectionModel to check * @n: The row to check @@ -248,7 +248,7 @@ e_selection_model_is_row_selected (ESelectionModel *selection, return FALSE; } -/** +/** * e_selection_model_foreach * @selection: #ESelectionModel to traverse * @callback: The callback function to call back. @@ -257,7 +257,7 @@ e_selection_model_is_row_selected (ESelectionModel *selection, * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -void +void e_selection_model_foreach (ESelectionModel *selection, EForeachFunc callback, gpointer closure) @@ -266,7 +266,7 @@ e_selection_model_foreach (ESelectionModel *selection, E_SELECTION_MODEL_GET_CLASS(selection)->foreach (selection, callback, closure); } -/** +/** * e_selection_model_clear * @selection: #ESelectionModel to clear * @@ -279,7 +279,7 @@ e_selection_model_clear(ESelectionModel *selection) E_SELECTION_MODEL_GET_CLASS(selection)->clear (selection); } -/** +/** * e_selection_model_selected_count * @selection: #ESelectionModel to count * @@ -296,7 +296,7 @@ e_selection_model_selected_count (ESelectionModel *selection) return 0; } -/** +/** * e_selection_model_select_all * @selection: #ESelectionModel to select all * @@ -310,7 +310,7 @@ e_selection_model_select_all (ESelectionModel *selection) E_SELECTION_MODEL_GET_CLASS(selection)->select_all (selection); } -/** +/** * e_selection_model_invert_selection * @selection: #ESelectionModel to invert * @@ -393,7 +393,7 @@ e_selection_model_set_selection_end (ESelectionModel *selection, int row) E_SELECTION_MODEL_GET_CLASS(selection)->set_selection_end (selection, row); } -/** +/** * e_selection_model_do_something * @selection: #ESelectionModel to do something to. * @row: The row to do something in. @@ -452,7 +452,7 @@ e_selection_model_do_something (ESelectionModel *selection, } } -/** +/** * e_selection_model_maybe_do_something * @selection: #ESelectionModel to do something to. * @row: The row to do something in. @@ -577,7 +577,7 @@ move_selection (ESelectionModel *selection, return TRUE; } -/** +/** * e_selection_model_key_press * @selection: #ESelectionModel to affect. * @key: The event. diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index c8bca0d61f..e9b76723f2 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-selection-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index c4e407a9c3..cb84f1e5b0 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -59,7 +59,7 @@ struct _ESendOptionsDialogPrivate { /* Security */ GtkWidget *security; - + /* Widgets for Reply Requestion options */ GtkWidget *reply_request; GtkWidget *reply_convenient; @@ -86,7 +86,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *when_declined; GtkWidget *when_accepted; GtkWidget *when_completed; - + /* label widgets */ GtkWidget *security_label; GtkWidget *priority_label; @@ -94,7 +94,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *sopts_label; GtkWidget *opened_label; GtkWidget *declined_label; - GtkWidget *accepted_label; + GtkWidget *accepted_label; GtkWidget *completed_label; GtkWidget *until_label; char *help_section; @@ -120,40 +120,40 @@ e_send_options_get_widgets_data (ESendOptionsDialog *sod) ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; ESendOptionsStatusTracking *sopts; - + priv = sod->priv; gopts = sod->data->gopts; sopts = sod->data->sopts; - + gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority); gopts->security = gtk_combo_box_get_active ((GtkComboBox *) priv->security); - + gopts->reply_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_request)); gopts->reply_convenient = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_convenient)); gopts->reply_within = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->within_days)); - + gopts->expiration_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->expiration)); gopts->expire_after = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->expire_after)); gopts->delay_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delay_delivery)); - - if (e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until)) && + + if (e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until)) && e_date_edit_time_is_valid (E_DATE_EDIT(priv->delay_until))) gopts->delay_until = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); sopts->tracking_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->create_sent)); - + sopts->autodelete = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->autodelete)); - + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered))) sopts->track_when = E_DELIVERED; else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delivered_opened))) sopts->track_when = E_DELIVERED_OPENED; else sopts->track_when = E_ALL; - + sopts->opened = gtk_combo_box_get_active ((GtkComboBox *) priv->when_opened); sopts->accepted = gtk_combo_box_get_active ((GtkComboBox *) priv->when_accepted); - sopts->declined = gtk_combo_box_get_active ((GtkComboBox *) priv->when_declined); + sopts->declined = gtk_combo_box_get_active ((GtkComboBox *) priv->when_declined); sopts->completed = gtk_combo_box_get_active ((GtkComboBox *) priv->when_completed); } @@ -162,56 +162,56 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; + ESendOptionsStatusTracking *sopts; time_t tmp; - + priv = sod->priv; gopts = sod->data->gopts; - sopts = sod->data->sopts; + sopts = sod->data->sopts; tmp = time (NULL); gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority); gtk_combo_box_set_active ((GtkComboBox *) priv->security, gopts->security); - if (gopts->reply_enabled) + if (gopts->reply_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), FALSE); - + if (gopts->reply_convenient) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_convenient), TRUE); - else + else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_within), TRUE); - + gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->within_days), (gdouble) gopts->reply_within); - - if (gopts->expiration_enabled) + + if (gopts->expiration_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->expiration), FALSE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->expire_after), (gdouble) gopts->expire_after); - if (gopts->delay_enabled) + if (gopts->delay_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delay_delivery), FALSE); - + if (!gopts->delay_until || (!difftime (gopts->delay_until, tmp) < 0)) e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); else e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), gopts->delay_until); - - if (sopts->tracking_enabled) + + if (sopts->tracking_enabled) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->create_sent), FALSE); - + if (sopts->autodelete) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->autodelete), FALSE); - + switch (sopts->track_when) { case E_DELIVERED: gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->delivered), TRUE); @@ -222,20 +222,20 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod) case E_ALL: gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->all_info), TRUE); } - + gtk_combo_box_set_active ((GtkComboBox *) priv->when_opened, sopts->opened); gtk_combo_box_set_active ((GtkComboBox *) priv->when_declined, sopts->declined); gtk_combo_box_set_active ((GtkComboBox *) priv->when_accepted, sopts->accepted); gtk_combo_box_set_active ((GtkComboBox *) priv->when_completed, sopts->completed); - + } - -static void + +static void sensitize_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; ESendOptionsGeneral *gopts; - ESendOptionsStatusTracking *sopts; + ESendOptionsStatusTracking *sopts; priv = sod->priv; gopts = sod->data->gopts; @@ -283,7 +283,7 @@ reply_request_toggled_cb (GtkWidget *toggle, gpointer data) gboolean active; ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; - + sod = data; priv = sod->priv; active = GTK_TOGGLE_BUTTON (toggle)->active; @@ -291,7 +291,7 @@ reply_request_toggled_cb (GtkWidget *toggle, gpointer data) gtk_widget_set_sensitive (priv->reply_convenient, active); gtk_widget_set_sensitive (priv->reply_within, active); gtk_widget_set_sensitive (priv->within_days, active); - + } static void @@ -300,7 +300,7 @@ delay_delivery_toggled_cb (GtkWidget *toggle, gpointer data) gboolean active; ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; - + sod = data; priv = sod->priv; active = GTK_TOGGLE_BUTTON (toggle)->active; @@ -335,14 +335,14 @@ delay_until_date_changed_cb (GtkWidget *dedit, gpointer data) sod = data; priv = sod->priv; - + current = time (NULL); tmp = e_date_edit_get_time (E_DATE_EDIT (priv->delay_until)); - if ((difftime (tmp, current) < 0) || !e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until)) + if ((difftime (tmp, current) < 0) || !e_date_edit_time_is_valid (E_DATE_EDIT (priv->delay_until)) || !e_date_edit_date_is_valid (E_DATE_EDIT (priv->delay_until))) e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0); - + } static void page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer data) @@ -363,34 +363,34 @@ page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer gtk_widget_hide (priv->completed_label); gtk_widget_hide (priv->when_completed); gtk_widget_set_sensitive (priv->autodelete, FALSE); - + gtk_widget_show (priv->accepted_label); gtk_widget_show (priv->when_accepted); sod->data->sopts = sod->data->copts; } else { gtk_widget_set_sensitive (priv->autodelete, FALSE); - + gtk_widget_show (priv->completed_label); gtk_widget_show (priv->when_completed); gtk_widget_show (priv->accepted_label); gtk_widget_show (priv->when_accepted); - sod->data->sopts = sod->data->topts; + sod->data->sopts = sod->data->topts; } } e_send_options_fill_widgets_with_data (sod); } - - + + static void init_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; - - priv = sod->priv; - + + priv = sod->priv; + g_signal_connect (priv->expiration, "toggled", G_CALLBACK (expiration_toggled_cb), sod); g_signal_connect (priv->reply_request, "toggled", G_CALLBACK (reply_request_toggled_cb), sod); - g_signal_connect (priv->delay_delivery, "toggled", G_CALLBACK (delay_delivery_toggled_cb), sod); + g_signal_connect (priv->delay_delivery, "toggled", G_CALLBACK (delay_delivery_toggled_cb), sod); g_signal_connect (priv->create_sent, "toggled", G_CALLBACK (sent_item_toggled_cb), sod); g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(e_send_options_cb), sod); @@ -401,7 +401,7 @@ init_widgets (ESendOptionsDialog *sod) } - + static gboolean get_widgets (ESendOptionsDialog *sod) { @@ -446,7 +446,7 @@ get_widgets (ESendOptionsDialog *sod) priv->declined_label = GW ("declined-label"); priv->accepted_label = GW ("accepted-label"); priv->completed_label = GW ("completed-label"); - + #undef GW return (priv->priority @@ -476,9 +476,9 @@ get_widgets (ESendOptionsDialog *sod) && priv->declined_label && priv->accepted_label && priv->completed_label); - + } - + static void setup_widgets (ESendOptionsDialog *sod, Item_type type) { @@ -488,7 +488,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) if (!priv->gopts_needed) { gtk_notebook_set_show_tabs (priv->notebook, FALSE); - gtk_notebook_set_current_page (priv->notebook, 1); + gtk_notebook_set_current_page (priv->notebook, 1); gtk_widget_hide (priv->delay_until); } else gtk_notebook_set_show_tabs (priv->notebook, TRUE); @@ -503,7 +503,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) if (priv->global) { GtkWidget *widget = gtk_label_new ("Calendar"); - gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); + gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); gtk_notebook_append_page (priv->notebook, priv->status, widget); gtk_widget_show (widget); widget = gtk_label_new ("Task"); @@ -511,7 +511,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_notebook_append_page (priv->notebook, priv->status,widget); gtk_notebook_set_show_tabs (priv->notebook, TRUE); } - + switch (type) { case E_ITEM_MAIL: priv->help_section = g_strdup ("usage-mail"); @@ -541,11 +541,11 @@ e_sendoptions_dialog_new (void) { ESendOptionsDialog *sod; sod = g_object_new (E_TYPE_SENDOPTIONS_DIALOG, NULL); - + return sod; } -void +void e_sendoptions_set_need_general_options (ESendOptionsDialog *sod, gboolean needed) { g_return_if_fail (E_IS_SENDOPTIONS_DIALOG (sod)); @@ -567,7 +567,7 @@ GtkWidget * send_options_make_dateedit (void) { EDateEdit *dedit; - + dedit = E_DATE_EDIT (e_date_edit_new ()); e_date_edit_set_show_date (dedit, TRUE); @@ -590,7 +590,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data { ESendOptionsDialogPrivate *priv; ESendOptionsDialog *sod; - GError *error = NULL; + GError *error = NULL; sod = func_data; priv = sod->priv; @@ -616,7 +616,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); } -gboolean +gboolean e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type) { ESendOptionsDialogPrivate *priv; @@ -624,7 +624,7 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type gchar *filename; g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE); - + priv = sod->priv; filename = g_build_filename (EVOLUTION_GLADEDIR, @@ -660,9 +660,9 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type sensitize_widgets (sod); init_widgets (sod); gtk_window_set_modal ((GtkWindow *)priv->main, TRUE); - + gtk_widget_show (priv->main); - + return TRUE; } @@ -691,17 +691,17 @@ e_sendoptions_dialog_finalize (GObject *object) g_free (sod->data->mopts); sod->data->mopts = NULL; } - + if (sod->data->copts) { g_free (sod->data->copts); sod->data->copts = NULL; } - + if (sod->data->topts) { g_free (sod->data->topts); sod->data->topts = NULL; - } - + } + if (sod->data) { g_free (sod->data); sod->data = NULL; @@ -711,7 +711,7 @@ e_sendoptions_dialog_finalize (GObject *object) g_free (sod->priv); sod->priv = NULL; } - + if (parent_class->finalize) (* parent_class->finalize) (object); @@ -736,7 +736,7 @@ e_sendoptions_dialog_init (GObject *object) ESendOptionsDialog *sod; ESendOptionsDialogPrivate *priv; ESendOptionsData *new; - + sod = E_SENDOPTIONS_DIALOG (object); new = g_new0 (ESendOptionsData, 1); diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 4a46dae4d1..c096d4696c 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -101,7 +101,7 @@ typedef struct { ESendOptionsStatusTracking *mopts; ESendOptionsStatusTracking *copts; ESendOptionsStatusTracking *topts; - + } ESendOptionsData; struct _ESendOptionsDialog { @@ -123,4 +123,4 @@ void e_sendoptions_set_need_general_options (ESendOptionsDialog *sod, gboolean n gboolean e_sendoptions_get_need_general_options (ESendOptionsDialog *sod); gboolean e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type); gboolean e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set); -#endif +#endif diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index bbd5d2e5f2..79ababe803 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -1,4 +1,4 @@ -/* +/* * Copyright © 2000 Eazel, Inc. * Copyright © 2002-2004 Marco Pesenti Gritti * Copyright © 2004, 2006 Christian Persch @@ -20,13 +20,13 @@ * Author: Andy Hertzfeld <andy@eazel.com> * * Ephy port by Marco Pesenti Gritti <marco@it.gnome.org> - * + * * $Id: e-spinner.c 12639 2006-12-12 17:06:55Z chpe $ */ /* * From Nautilus ephy-spinner.c - */ + */ #include "config.h" @@ -259,7 +259,7 @@ e_spinner_images_load (GdkScreen *screen, if (icon_info == NULL) { g_warning ("Throbber animation not found"); - + /* If the icon naming spec compliant name wasn't found, try the old name */ icon_info = gtk_icon_theme_lookup_icon (icon_theme, SPINNER_FALLBACK_ICON_NAME, @@ -463,7 +463,7 @@ e_spinner_cache_init (ESpinnerCache *cache) static void e_spinner_cache_finalize (GObject *object) { - ESpinnerCache *cache = E_SPINNER_CACHE (object); + ESpinnerCache *cache = E_SPINNER_CACHE (object); ESpinnerCachePrivate *priv = cache->priv; g_hash_table_destroy (priv->hash); @@ -644,7 +644,7 @@ e_spinner_expose (GtkWidget *widget, /* Otherwise |images| will be NULL anyway */ g_return_val_if_fail (images->n_animation_pixbufs > 0, FALSE); - + g_return_val_if_fail (details->current_image >= 0 && details->current_image < images->n_animation_pixbufs, FALSE); diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h index c3f4e9263a..e438b43aab 100644 --- a/widgets/misc/e-spinner.h +++ b/widgets/misc/e-spinner.h @@ -23,7 +23,7 @@ */ /* - * From Nautilus ephy-spinner.h + * From Nautilus ephy-spinner.h */ #ifndef E_SPINNER_H #define E_SPINNER_H diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index eda370584c..075322dd97 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -93,7 +93,7 @@ static void e_task_bar_init (ETaskBar *task_bar) { GtkWidget *label, *hbox; - + task_bar->priv = g_new (ETaskBarPrivate, 1); gtk_box_set_spacing (GTK_BOX (task_bar), 10); @@ -101,7 +101,7 @@ e_task_bar_init (ETaskBar *task_bar) label = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); task_bar->priv->message_label = label; hbox = gtk_hbox_new (FALSE, 0); @@ -208,7 +208,7 @@ e_task_bar_remove_task (ETaskBar *task_bar, if (g_list_length (GTK_BOX (task_bar->priv->hbox)->children) == 0) gtk_widget_hide (GTK_WIDGET (task_bar->priv->hbox)); } - + ETaskWidget * e_task_bar_get_task_widget (ETaskBar *task_bar, int n) diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 744b80272f..50301326d6 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -45,7 +45,7 @@ typedef struct _ETaskBarClass ETaskBarClass; struct _ETaskBar { GtkHBox parent; - + ETaskBarPrivate *priv; }; diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 0321587310..50d459d3f0 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -95,7 +95,7 @@ static void e_task_widget_class_init (ETaskWidgetClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } @@ -149,7 +149,7 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_widget_show (box); gtk_widget_set_size_request (box, 1, -1); - + /* FIXME: Experimenting Spinner widget instead of an image. REWORK THIS */ /* priv->icon_pixbuf = g_object_ref (icon_pixbuf); */ @@ -239,7 +239,7 @@ e_task_wiget_unalert (ETaskWidget *task_widget) g_return_if_fail (task_widget != NULL); g_return_if_fail (E_IS_TASK_WIDGET (task_widget)); } - + const char * e_task_widget_get_component_id (ETaskWidget *task_widget) diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index cdbd715871..5aec40a125 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -321,7 +321,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) ibl = bytes; new = ob = g_new (char, ibl * 4 + 4); obl = ibl * 4; - + while (ibl > 0) { e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { @@ -337,16 +337,16 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) ib += len; ibl = bytes - (ib - string); if (ibl > bytes) ibl = 0; - + /* FIXME: this is wrong... what if the destination charset is 16 or 32 bit? */ *ob++ = '_'; obl--; } } - + /* Make sure to terminate with plenty of padding */ memset (ob, 0, 4); - + return new; } @@ -501,7 +501,7 @@ e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text) else gtk_entry_set_text (entry, text); } - + /* * Translate \U+XXXX\ sequences to utf8 chars */ @@ -591,9 +591,9 @@ e_utf8_xml1_encode (const gchar *text) * @outbuf: output buffer, must have at least 6 bytes of space. * If %NULL, the length will be computed and returned * and nothing will be written to @out. - * + * * Convert a single character to utf8 - * + * * Return value: number of bytes written **/ diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 59469cc6a0..1b921f07b0 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -83,7 +83,7 @@ class_init (EUrlEntryClass *klass) widget_class = GTK_WIDGET_CLASS (klass); parent_class = g_type_class_ref(gtk_hbox_get_type ()); - + object_class->destroy = destroy; widget_class->mnemonic_activate = mnemonic_activate; @@ -111,7 +111,7 @@ init (EUrlEntry *url_entry) gtk_widget_show (priv->button); gtk_widget_show (priv->entry); - + g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked_cb), url_entry); g_signal_connect (priv->entry, "changed", @@ -122,7 +122,7 @@ static void destroy (GtkObject *obj) { EUrlEntry *url_entry; - + url_entry = E_URL_ENTRY (obj); if (url_entry->priv) { g_free (url_entry->priv); @@ -158,12 +158,12 @@ GtkWidget * e_url_entry_get_entry (EUrlEntry *url_entry) { EUrlEntryPrivate *priv; - + g_return_val_if_fail (url_entry != NULL, NULL); g_return_val_if_fail (E_IS_URL_ENTRY (url_entry), NULL); priv = url_entry->priv; - + return priv->entry; } @@ -185,10 +185,10 @@ entry_changed_cb (GtkEditable *editable, gpointer data) EUrlEntry *url_entry; EUrlEntryPrivate *priv; const char *url; - + url_entry = E_URL_ENTRY (data); priv = url_entry->priv; - + url = gtk_entry_get_text (GTK_ENTRY (priv->entry)); gtk_widget_set_sensitive (priv->button, url != NULL && *url != '\0'); } diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c index 9117976a1a..6039e4b902 100644 --- a/widgets/misc/test-color.c +++ b/widgets/misc/test-color.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * test-color.c * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index fef505d47a..80c6a37a14 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -19,7 +19,7 @@ * * Authors: * Ettore Perazzoli <ettore@ximian.com> - * Damon Chaplin <damon@ximian.com> + * Damon Chaplin <damon@ximian.com> */ #ifdef HAVE_CONFIG_H |