diff options
-rw-r--r-- | calendar/gui/print.c | 9 | ||||
-rw-r--r-- | mail/em-composer-utils.c | 2 | ||||
-rw-r--r-- | mail/mail-ops.c | 2 | ||||
-rw-r--r-- | mail/mail-send-recv.c | 6 | ||||
-rw-r--r-- | plugins/face/face.c | 6 | ||||
-rw-r--r-- | plugins/prefer-plain/prefer-plain.c | 4 | ||||
-rw-r--r-- | widgets/misc/e-buffer-tagger.c | 10 |
7 files changed, 19 insertions, 20 deletions
diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 3cb2cedae6..829dde34bd 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -432,7 +432,7 @@ print_text (GtkPrintContext *context, PangoFontDescription *desc, /* Set a clipping rectangle. */ cairo_move_to (cr, x1, y1); cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); - cairo_clip (cr); + cairo_clip (cr); cairo_new_path (cr); cairo_set_source_rgb (cr, 0, 0, 0); @@ -1311,12 +1311,11 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, rows_in_top_display = MIN (MAX (rows_in_top_display, DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY), (bottom-top)*0.5/DAY_VIEW_ROW_HEIGHT); - for (i = 0; i < rows_in_top_display; i++) { - if (i < (rows_in_top_display - 1) || + if (i < (rows_in_top_display - 1) || rows_in_top_display >= pdi.long_events->len) { - event = &g_array_index (pdi.long_events, EDayViewEvent, i); + event = &g_array_index (pdi.long_events, EDayViewEvent, i); print_day_long_event (context, font, left, right, top, bottom, DAY_VIEW_ROW_HEIGHT, event, &pdi, model); } else { @@ -1337,7 +1336,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, /* Right align - 10 comes from print_day_long_event too */ x = right - gdk_pixbuf_get_width (pixbuf) * 0.5 - 10; - /* Placing '...' at mid height. 4 and 7 constant come from print_day_long_event + /* Placing '...' at mid height. 4 and 7 constant come from print_day_long_event (offsets used to place events boxes in their respective cells) */ y = top + DAY_VIEW_ROW_HEIGHT * i + (DAY_VIEW_ROW_HEIGHT - 4 - 7) * 0.5; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index b2083b78d3..f03a66d7f5 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -2015,7 +2015,7 @@ get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInterne camel_internet_address_get (reply_to, 0, &name, &addr); camel_internet_address_add (to, name, addr); } - + /* promote the first Cc: address to To: if To: is empty */ if (camel_address_length ((CamelAddress *) to) == 0 && camel_address_length ((CamelAddress *)cc) > 0) { camel_internet_address_get (cc, 0, &name, &addr); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index b65c7f3c59..0f17dc2a4a 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -964,7 +964,7 @@ static gchar * transfer_messages_desc (struct _transfer_msg *m) { return g_strdup_printf (m->delete ? _("Moving messages to '%s'") : _("Copying messages to '%s'"), - m->dest_uri); + m->dest_uri); } diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 597ec61bf0..b0cff31a9d 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -122,7 +122,7 @@ struct _send_info { gint pc; GtkWidget *send_account_label; - char *send_url; + gchar *send_url; /*time_t update;*/ struct _send_data *data; @@ -282,7 +282,7 @@ operation_status_timeout(gpointer data) GTK_LABEL (info->status_label), info->what); if (info->send_url && info->send_account_label) { - char *tmp = format_url (info->send_url, NULL); + gchar *tmp = format_url (info->send_url, NULL); g_free (info->send_url); info->send_url = NULL; @@ -315,7 +315,7 @@ set_send_status(struct _send_info *info, const gchar *desc, gint pc) } static void -set_send_account (struct _send_info *info, const char *account_url) +set_send_account (struct _send_info *info, const gchar *account_url) { g_static_mutex_lock (&status_lock); diff --git a/plugins/face/face.c b/plugins/face/face.c index 19856b3e58..67c37f7cd0 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -96,7 +96,7 @@ set_face_raw (gchar *content, gsize length) if (content) { gchar *file_contents; - + file_contents = g_base64_encode ((guchar *) content, length); g_file_set_contents (filename, file_contents, -1, NULL); g_free (file_contents); @@ -132,7 +132,7 @@ get_active_face (void) } g_free (face); - + loader = gdk_pixbuf_loader_new (); if (gdk_pixbuf_loader_write (loader, data, data_len, NULL) @@ -259,7 +259,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data) preview = GTK_WIDGET (data); filename = gtk_file_chooser_get_preview_filename (file_chooser); - + have_preview = filename && prepare_image (filename, &file_contents, &length, &pixbuf, FALSE); if (have_preview) { g_free (file_contents); diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 6366e26831..39e8d66b58 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -258,12 +258,12 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem info = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (info), 0.0, 0.5); gtk_label_set_line_wrap (GTK_LABEL (info), TRUE); - + gtk_widget_show (info); update_info_label (info, epp_mode); g_signal_connect (dropdown, "changed", G_CALLBACK(epp_mode_changed), info); - + i = ((GtkTable *)data->parent)->nrows; gtk_table_attach((GtkTable *)data->parent, w, 0, 1, i, i+1, 0, 0, 0, 0); gtk_table_attach((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i, i+1, GTK_FILL|GTK_EXPAND, 0, 0, 0); diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c index d0fd265230..248e1c004c 100644 --- a/widgets/misc/e-buffer-tagger.c +++ b/widgets/misc/e-buffer-tagger.c @@ -86,10 +86,10 @@ markup_text (GtkTextBuffer *buffer) { GtkTextIter start, end; gchar *text; - int i; + gint i; regmatch_t pmatch [2]; gboolean any; - const char *str; + const gchar *str; gint offset = 0; g_return_if_fail (buffer != NULL); @@ -378,7 +378,7 @@ textview_key_press_event (GtkWidget *text_view, GdkEventKey *event) return FALSE; switch (event->keyval) { - case GDK_Return: + case GDK_Return: case GDK_KP_Enter: buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); gtk_text_buffer_get_iter_at_mark (buffer, &iter, gtk_text_buffer_get_insert (buffer)); @@ -497,7 +497,7 @@ textview_visibility_notify_event (GtkTextView *textview, GdkEventVisibility *eve gdk_window_get_pointer (gtk_text_view_get_window (textview, GTK_TEXT_WINDOW_WIDGET), &wx, &wy, NULL); - gtk_text_view_window_to_buffer_coords (textview, + gtk_text_view_window_to_buffer_coords (textview, GTK_TEXT_WINDOW_WIDGET, wx, wy, &bx, &by); @@ -524,7 +524,7 @@ e_buffer_tagger_connect (GtkTextView *textview) /* if tag is there already, then it is connected, thus claim */ g_return_if_fail (tag == NULL); - + gtk_text_buffer_create_tag (buffer, E_BUFFER_TAGGER_LINK_TAG, "foreground", "blue", "underline", PANGO_UNDERLINE_SINGLE, |