diff options
33 files changed, 409 insertions, 204 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index ba7ff79ee8..197ce2bdf5 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1136,7 +1136,7 @@ set_attributes_named (EVCard *vcard, const gchar *attr_name, GList *attr_list) static void set_arrow_image (EContactEditor *editor, - const char *arrow_widget, + const gchar *arrow_widget, gboolean expanded) { GtkWidget *arrow; @@ -1150,10 +1150,10 @@ set_arrow_image (EContactEditor *editor, static void expand_widget_list (EContactEditor *editor, - const char **widget_names, + const gchar **widget_names, gboolean expanded) { - int i; + gint i; for (i = 0; widget_names[i]; i++) gtk_widget_set_visible ( e_builder_get_widget (editor->builder, widget_names[i]), @@ -1163,7 +1163,7 @@ expand_widget_list (EContactEditor *editor, static void expand_phone (EContactEditor *editor, gboolean expanded) { - const char *names[] = { + const gchar *names[] = { "entry-phone-2", "combobox-phone-2", "entry-phone-4", "combobox-phone-4", "table-phone-extended", NULL @@ -1177,7 +1177,7 @@ expand_mail (EContactEditor *editor, gboolean expanded) { GtkTable *table; GtkWidget *check; - const char *names[] = { + const gchar *names[] = { "entry-email-2", "combobox-email-2", "entry-email-3", "combobox-email-3", "entry-email-4", "combobox-email-4", @@ -1190,14 +1190,16 @@ expand_mail (EContactEditor *editor, gboolean expanded) check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); if (check != NULL && table != NULL) { - g_object_ref (G_OBJECT (check)); - gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (check)), - check); + GtkWidget *parent; + + g_object_ref (check); + parent = gtk_widget_get_parent (check); + gtk_container_remove (GTK_CONTAINER (parent), check); if (expanded) gtk_table_attach_defaults (table, check, 0, 4, 2, 3); else gtk_table_attach_defaults (table, check, 2, 4, 0, 1); - g_object_unref (G_OBJECT (check)); + g_object_unref (check); } } diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index bc270d2d97..f7ab89bec0 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1007,7 +1007,6 @@ struct _date_query_msg { GnomeCalendar *gcal; }; - static void free_dn_queries (GnomeCalendar *gcal) { @@ -1455,7 +1454,6 @@ gnome_calendar_do_dispose (GObject *object) gcal = GNOME_CALENDAR (object); priv = gcal->priv; - if (priv->model != NULL) { g_signal_handlers_disconnect_by_func ( priv->model, view_progress_cb, gcal); diff --git a/calendar/gui/print.c b/calendar/gui/print.c index f563168d5e..0b3f8003c9 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -2415,26 +2415,33 @@ print_date_label (GtkPrintContext *context, ECalComponent *comp, ECal *client, write_label_piece (start, buffer, 1024, NULL, NULL); if (end > 0 && start > 0) { - /* Translators: This is part of "START to END" text, where START and END are date/times */ + /* Translators: This is part of "START to END" text, + * where START and END are date/times. */ write_label_piece (end, buffer, 1024, _(" to "), NULL); } if (complete > 0) { if (start > 0) { - /* Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time */ + /* Translators: This is part of "START to END + * (Completed COMPLETED)", where COMPLETED is a + * completed date/time. */ write_label_piece (complete, buffer, 1024, _(" (Completed "), ")"); } else { - /* Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time */ + /* Translators: This is part of "Completed COMPLETED", + * where COMPLETED is a completed date/time. */ write_label_piece (complete, buffer, 1024, _("Completed "), NULL); } } if (due > 0 && complete == 0) { if (start > 0) { - /* Translators: This is part of "START (Due DUE)", where START and DUE are dates/times */ + /* Translators: This is part of "START (Due DUE)", + * where START and DUE are dates/times. */ write_label_piece (due, buffer, 1024, _(" (Due "), ")"); } else { - /* Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished */ + /* Translators: This is part of "Due DUE", + * where DUE is a date/time due the event + * should be finished. */ write_label_piece (due, buffer, 1024, _("Due "), NULL); } } diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 99ff93a065..9f96bcd6ef 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -56,7 +56,7 @@ anjal_mail_view_finalize (GObject *object) G_OBJECT_CLASS (anjal_mail_view_parent_class)->finalize (object); } -static void +static void view_set_folder_uri (AnjalMailView *mail_view, const gchar *uri) { } diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index d3cddc9b28..d208981a65 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -130,8 +130,9 @@ in_right (MailDecoration *md, double x) static void set_cursor (MailDecoration *md, GdkWindowEdge edge) { - gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (md->window)), - md->priv->cursors[edge]); + gdk_window_set_cursor ( + gtk_widget_get_window (GTK_WIDGET (md->window)), + md->priv->cursors[edge]); md->priv->default_cursor = FALSE; } @@ -140,8 +141,9 @@ reset_cursor (MailDecoration *md) { if (!md->priv->default_cursor) { md->priv->default_cursor = TRUE; - gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (md->window)), - NULL); + gdk_window_set_cursor ( + gtk_widget_get_window (GTK_WIDGET (md->window)), + NULL); } } diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index a9e477abd7..fe71153655 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -129,7 +129,7 @@ handle_incoming (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "username") == 0) { provider->recv_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; @@ -153,7 +153,7 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "username") == 0) { provider->send_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; @@ -246,7 +246,9 @@ guess_when_online (EmailProvider *provider) SoupMessage *msg; SoupSession *session; - url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); + url = g_strdup_printf ( + "https://live.mozillamessaging.com/autoconfig/%s", + provider->domain); parsed = soup_uri_new (url); soup_uri_free (parsed); @@ -332,10 +334,17 @@ main (gint argc, gchar **argv) mail_guess_servers (provider); - printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n", - provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth, - provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth, - provider->recv_socket_type, provider->send_socket_type); + printf ( + "Recv: %s\n%s(%s), %s by %s \n " + "Send: %s\n%s(%s), %s by %s\n via %s to %s\n", + provider->recv_type, provider->recv_hostname, + provider->recv_port, provider->recv_username, + provider->recv_auth, + provider->send_type, provider->send_hostname, + provider->send_port, provider->send_username, + provider->send_auth, + provider->recv_socket_type, + provider->send_socket_type); return 0; } #endif diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index 5bace17d4d..43b2a9d37d 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -56,7 +56,7 @@ composer_post_header_folder_name_to_string (EComposerPostHeader *header, if (!res) res = g_strdup (url + length); } - } + } if (!res) { res = g_uri_unescape_string (url, NULL); diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c index 4dc34174a1..a44f86e8bf 100644 --- a/e-util/e-alert-dialog.c +++ b/e-util/e-alert-dialog.c @@ -215,7 +215,9 @@ e_alert_dialog_constructed (GObject *obj) if (e_alert_get_scroll (alert)) { scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); } w = gtk_label_new(NULL); gtk_label_set_selectable((GtkLabel *)w, TRUE); @@ -270,7 +272,9 @@ e_alert_dialog_class_init (EAlertDialogClass *klass) GtkWidget* e_alert_dialog_new (GtkWindow *parent, EAlert *alert) { - return (GtkWidget*) g_object_new (E_TYPE_ALERT_DIALOG, "parent", parent, "alert", alert, NULL); + return g_object_new ( + E_TYPE_ALERT_DIALOG, + "parent", parent, "alert", alert, NULL); } GtkWidget* diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index d224b9d572..e5d5a1998e 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -53,7 +53,8 @@ typedef struct { that have not received change notification yet. */ - GConfValue *use_first_value; /* Not NULL when the object is a Widget and wasn't realized */ + GConfValue *use_first_value; /* Not NULL when the object is a + Widget and wasn't realized. */ GObject *object; GParamSpec *prop; diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 10110734ae..6f7aec337d 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -671,13 +671,16 @@ e_mail_reader_header_free (EMailReaderHeader *header) } static void -headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailReader *reader) +headers_changed_cb (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + EMailReader *reader) { EMFormat *emf; EMFormatHTMLDisplay *emfhd; GSList *header_config_list, *p; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); g_return_if_fail (reader != NULL); emfhd = e_mail_reader_get_html_display (reader); @@ -687,7 +690,9 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR emf = EM_FORMAT (emfhd); g_return_if_fail (emf != NULL); - header_config_list = gconf_client_get_list (gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL); + header_config_list = gconf_client_get_list ( + client, "/apps/evolution/mail/display/headers", + GCONF_VALUE_STRING, NULL); em_format_clear_headers (emf); for (p = header_config_list; p; p = g_slist_next(p)) { EMailReaderHeader *h; @@ -715,16 +720,16 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR static void remove_header_notify_cb (gpointer data) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); notify_id = GPOINTER_TO_INT (data); g_return_if_fail (notify_id != 0); - gconf_client_notify_remove (gconf, notify_id); - gconf_client_remove_dir (gconf, "/apps/evolution/mail/display", NULL); + gconf_client_notify_remove (client, notify_id); + gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL); } /** @@ -737,13 +742,20 @@ remove_header_notify_cb (gpointer data) void e_mail_reader_connect_headers (EMailReader *reader) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - gconf_client_add_dir (gconf, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); - notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/headers", (GConfClientNotifyFunc) headers_changed_cb, reader, NULL, NULL); + gconf_client_add_dir ( + client, "/apps/evolution/mail/display", + GCONF_CLIENT_PRELOAD_NONE, NULL); + notify_id = gconf_client_notify_add ( + client, "/apps/evolution/mail/display/headers", + (GConfClientNotifyFunc) headers_changed_cb, + reader, NULL, NULL); - g_object_set_data_full (G_OBJECT (reader), "reader-header-notify-id", GINT_TO_POINTER (notify_id), remove_header_notify_cb); + g_object_set_data_full ( + G_OBJECT (reader), "reader-header-notify-id", + GINT_TO_POINTER (notify_id), remove_header_notify_cb); - headers_changed_cb (gconf, 0, NULL, reader); + headers_changed_cb (client, 0, NULL, reader); } diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 702e63e723..e253770562 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2087,7 +2087,7 @@ emae_create_basic_assistant_page (EMAccountEditor *emae, GtkAssistant *assistant gtk_widget_show (lbl); if (g_ascii_strcasecmp (page_id, "start_page") == 0) - g_hash_table_insert (emae->priv->widgets, (char *)"start_page_label", lbl); + g_hash_table_insert (emae->priv->widgets, (gchar *)"start_page_label", lbl); if (old) { /* keep page on its previous index */ @@ -2118,7 +2118,6 @@ static struct { { "identity_organization", E_ACCOUNT_ID_ORGANIZATION }, }; - static void emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *first, ...) { @@ -2126,7 +2125,7 @@ emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *fir va_start (ap, first); while (first) { - g_hash_table_insert (emae->priv->widgets, (char *)first, e_builder_get_widget (builder, first)); + g_hash_table_insert (emae->priv->widgets, (gchar *)first, e_builder_get_widget (builder, first)); first = va_arg (ap, const gchar *); } va_end (ap); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index bab7e7cae9..6e2ba166ba 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2821,22 +2821,22 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree, goto next; group_name = g_strdup_printf ("Store %s", uri); - + if (e_shell_get_express_mode (shell)) { gboolean system = FALSE; if (strncmp (uri, "vfolder", 7) == 0 || strncmp(uri, "mbox", 4) == 0) system = TRUE; - + if (!system && !g_key_file_has_key (key_file, group_name, key, NULL)) { GtkTreePath *path; - + path = gtk_tree_model_get_path (tree_model, &iter); gtk_tree_view_expand_row (tree_view, path, FALSE); gtk_tree_path_free (path); } - + } else if (!g_key_file_has_key (key_file, group_name, key, NULL)) { GtkTreePath *path; diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index dc409aa0ce..56f692dd6b 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -151,7 +151,7 @@ cal_chell_content_get_pad_state_filename (EShellContent *shell_content, ETable * g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL); g_return_val_if_fail (table != NULL, NULL); g_return_val_if_fail (E_IS_TABLE (table), NULL); - + if (E_IS_TASK_TABLE (table)) nick = "TaskPad"; else if (E_IS_MEMO_TABLE (table)) @@ -200,11 +200,15 @@ e_cal_shell_content_save_state (ECalShellContent *cal_shell_content) priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (cal_shell_content); - if (priv->task_table) - cal_shell_content_save_table_state (E_SHELL_CONTENT (cal_shell_content), E_TABLE (priv->task_table)); + if (priv->task_table != NULL) + cal_shell_content_save_table_state ( + E_SHELL_CONTENT (cal_shell_content), + E_TABLE (priv->task_table)); if (priv->memo_table != NULL) - cal_shell_content_save_table_state (E_SHELL_CONTENT (cal_shell_content), E_TABLE (priv->memo_table)); + cal_shell_content_save_table_state ( + E_SHELL_CONTENT (cal_shell_content), + E_TABLE (priv->memo_table)); } static void @@ -344,11 +348,11 @@ cal_shell_content_constructed (GObject *object) /* We borrow the memopad and taskpad models from the memo * and task views, loading the views if necessary. */ - if(!e_shell_get_express_mode(e_shell_get_default())) { + if (!e_shell_get_express_mode(e_shell_get_default())) { foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); foreign_content = e_shell_view_get_shell_content (foreign_view); g_object_get (foreign_content, "model", &memo_model, NULL); - + foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); foreign_content = e_shell_view_get_shell_content (foreign_view); g_object_get (foreign_content, "model", &task_model, NULL); @@ -356,7 +360,7 @@ cal_shell_content_constructed (GObject *object) /* Build content widgets. */ container = GTK_WIDGET (object); - + if (!e_shell_get_express_mode(e_shell_get_default())) { widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_container_add (GTK_CONTAINER (container), widget); @@ -369,7 +373,7 @@ cal_shell_content_constructed (GObject *object) widget = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); - if (!e_shell_get_express_mode(e_shell_get_default())) + if (!e_shell_get_express_mode(e_shell_get_default())) gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE); else gtk_container_add (GTK_CONTAINER (container), widget); @@ -408,7 +412,7 @@ cal_shell_content_constructed (GObject *object) priv->notebook, "page"); container = priv->vpaned; -if(!e_shell_get_express_mode(e_shell_get_default())) { +if (!e_shell_get_express_mode(e_shell_get_default())) { widget = gtk_vbox_new (FALSE, 0); gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); gtk_widget_show (widget); @@ -501,7 +505,7 @@ if(!e_shell_get_express_mode(e_shell_get_default())) { * The GtkWidget::map() callback below explains why. */ priv->view_instance = view_instance; - if (!e_shell_get_express_mode(e_shell_get_default())) { + if (!e_shell_get_express_mode(e_shell_get_default())) { g_signal_connect_swapped ( shell_view, "notify::view-id", G_CALLBACK (cal_shell_content_notify_view_id_cb), @@ -552,7 +556,7 @@ cal_shell_content_class_init (ECalShellContentClass *class) object_class->get_property = cal_shell_content_get_property; object_class->dispose = cal_shell_content_dispose; object_class->constructed = cal_shell_content_constructed; - + widget_class = GTK_WIDGET_CLASS (class); widget_class->map = cal_shell_content_map; diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index db0d0a072f..20e0a96a67 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -277,9 +277,15 @@ static void cal_shell_sidebar_set_default (ECalShellSidebar *cal_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + ECalShellContent *cal_shell_content; ECalSourceType source_type; GHashTable *client_table; + ECalModel *model; ECal *client; + icaltimezone *timezone; const gchar *uid; source_type = E_CAL_SOURCE_TYPE_EVENT; @@ -304,7 +310,17 @@ cal_shell_sidebar_set_default (ECalShellSidebar *cal_shell_sidebar, G_CALLBACK (cal_shell_sidebar_default_opened_cb), cal_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to ECalShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + cal_shell_content = E_CAL_SHELL_CONTENT (shell_content); + model = e_cal_shell_content_get_model (cal_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } @@ -895,11 +911,17 @@ void e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + ECalShellContent *cal_shell_content; ECalSourceType source_type; ESourceSelector *selector; GHashTable *client_table; + ECalModel *model; ECal *default_client; ECal *client; + icaltimezone *timezone; const gchar *uid; const gchar *uri; gchar *message; @@ -958,7 +980,17 @@ e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar, G_CALLBACK (cal_shell_sidebar_client_opened_cb), cal_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_cal_shell_content_get_model (E_CAL_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (cal_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to ECalShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + cal_shell_content = E_CAL_SHELL_CONTENT (shell_content); + model = e_cal_shell_content_get_model (cal_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 17afe3bf7a..3251183000 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1213,7 +1213,7 @@ quit_calendar_cb (GtkAction *action, event->any.send_event = TRUE; gtk_main_do_event (event); gdk_event_free (event); - + } static void @@ -1454,7 +1454,7 @@ static GtkActionEntry calendar_entries[] = { NULL, NULL, /* XXX Add a tooltip! */ G_CALLBACK (quit_calendar_cb) }, - + /*** Menus ***/ { "calendar-actions-menu", @@ -1716,7 +1716,7 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view) cal_shell_content = cal_shell_view->priv->cal_shell_content; searchbar = e_cal_shell_content_get_searchbar (cal_shell_content); - + /* Calendar Actions */ action_group = ACTION_GROUP (CALENDAR); gtk_action_group_add_actions ( diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 1c9c26840c..71db1236c1 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -535,7 +535,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) G_CALLBACK (cal_shell_view_selector_client_removed_cb), cal_shell_view); - if (memo_table) + if (memo_table) g_signal_connect_swapped ( memo_table, "popup-event", G_CALLBACK (cal_shell_view_memopad_popup_event_cb), @@ -564,7 +564,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) task_table, "status-message", G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), cal_shell_view); - + if (task_table) g_signal_connect_swapped ( task_table, "selection-change", diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 29d8fd08b1..a489fe59a7 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -303,35 +303,37 @@ cal_shell_view_update_actions (EShellView *shell_view) shell_window = e_shell_view_get_shell_window (shell_view); - if(e_shell_get_express_mode(e_shell_get_default())) { + if (e_shell_get_express_mode(e_shell_get_default())) { GtkWidget *widget, *item; GdkScreen *scr; gint monitor; GdkRectangle rect; - /* Hack: Get rid of New and Send/Receive in toolbar + /* Hack: Get rid of New and Send/Receive in toolbar * while in express mode */ widget = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar"); item = (GtkWidget *)gtk_toolbar_get_nth_item ((GtkToolbar *)widget, 0); gtk_widget_hide(item); - + widget = e_shell_window_get_managed_widget ( shell_window, "/main-menu"); gtk_widget_hide(widget); - + item = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar/send-receive"); - gtk_widget_hide(item); + gtk_widget_hide(item); scr = gdk_screen_get_default (); - monitor = gdk_screen_get_monitor_at_window (scr, - gtk_widget_get_window (GTK_WIDGET (shell_window))); + monitor = gdk_screen_get_monitor_at_window ( + scr, gtk_widget_get_window (GTK_WIDGET (shell_window))); gdk_screen_get_monitor_geometry (scr, monitor, &rect); - - gtk_window_set_default_size ((GtkWindow *)shell_window, rect.width, rect.height); - gtk_window_set_decorated ((GtkWindow *)shell_window, FALSE); + + gtk_window_set_default_size ( + GTK_WINDOW (shell_window), rect.width, rect.height); + gtk_window_set_decorated ( + GTK_WINDOW (shell_window), FALSE); } cal_shell_content = priv->cal_shell_content; @@ -503,11 +505,11 @@ cal_shell_view_class_init (ECalShellViewClass *class, shell_view_class->new_shell_sidebar = e_cal_shell_sidebar_new; shell_view_class->execute_search = cal_shell_view_execute_search; shell_view_class->update_actions = cal_shell_view_update_actions; - - if(e_shell_get_express_mode(e_shell_get_default())) + + if (e_shell_get_express_mode(e_shell_get_default())) shell_view_class->construct_searchbar = NULL; -} +} static void cal_shell_view_init (ECalShellView *cal_shell_view, diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 984294472e..416759213e 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -272,9 +272,15 @@ static void memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + EMemoShellContent *memo_shell_content; ECalSourceType source_type; GHashTable *client_table; + ECalModel *model; ECal *client; + icaltimezone *timezone; const gchar *uid; source_type = E_CAL_SOURCE_TYPE_JOURNAL; @@ -299,7 +305,17 @@ memo_shell_sidebar_set_default (EMemoShellSidebar *memo_shell_sidebar, G_CALLBACK (memo_shell_sidebar_default_opened_cb), memo_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to EMemoShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content); + model = e_memo_shell_content_get_memo_model (memo_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } @@ -813,11 +829,17 @@ void e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + EMemoShellContent *memo_shell_content; ECalSourceType source_type; ESourceSelector *selector; GHashTable *client_table; + ECalModel *model; ECal *default_client; ECal *client; + icaltimezone *timezone; const gchar *uid; const gchar *uri; gchar *message; @@ -876,7 +898,17 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar, G_CALLBACK (memo_shell_sidebar_client_opened_cb), memo_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_memo_shell_content_get_memo_model (E_MEMO_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (memo_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to EMemoShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content); + model = e_memo_shell_content_get_memo_model (memo_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index db80a50500..07eb43bdbf 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -272,9 +272,15 @@ static void task_shell_sidebar_set_default (ETaskShellSidebar *task_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + ETaskShellContent *task_shell_content; ECalSourceType source_type; GHashTable *client_table; + ECalModel *model; ECal *client; + icaltimezone *timezone; const gchar *uid; source_type = E_CAL_SOURCE_TYPE_TODO; @@ -299,7 +305,17 @@ task_shell_sidebar_set_default (ETaskShellSidebar *task_shell_sidebar, G_CALLBACK (task_shell_sidebar_default_opened_cb), task_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to ETaskShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + task_shell_content = E_TASK_SHELL_CONTENT (shell_content); + model = e_task_shell_content_get_task_model (task_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } @@ -813,11 +829,17 @@ void e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar, ESource *source) { + EShellView *shell_view; + EShellContent *shell_content; + EShellSidebar *shell_sidebar; + ETaskShellContent *task_shell_content; ECalSourceType source_type; ESourceSelector *selector; GHashTable *client_table; + ECalModel *model; ECal *default_client; ECal *client; + icaltimezone *timezone; const gchar *uid; const gchar *uri; gchar *message; @@ -876,7 +898,17 @@ e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar, G_CALLBACK (task_shell_sidebar_client_opened_cb), task_shell_sidebar); - e_cal_set_default_timezone (client, e_cal_model_get_timezone (e_task_shell_content_get_task_model (E_TASK_SHELL_CONTENT (e_shell_view_get_shell_content (e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (task_shell_sidebar)))))), NULL); + /* FIXME Sidebar should not be accessing the EShellContent. + * This probably needs to be moved to ETaskShellView. */ + shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar); + shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); + shell_content = e_shell_view_get_shell_content (shell_view); + + task_shell_content = E_TASK_SHELL_CONTENT (shell_content); + model = e_task_shell_content_get_task_model (task_shell_content); + timezone = e_cal_model_get_timezone (model); + + e_cal_set_default_timezone (client, timezone, NULL); e_cal_open_async (client, FALSE); } diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c index c55d09c54a..03be9f74ab 100644 --- a/modules/connman/evolution-connman.c +++ b/modules/connman/evolution-connman.c @@ -51,7 +51,7 @@ static gboolean network_manager_connect (EConnMan *extension); G_DEFINE_DYNAMIC_TYPE (EConnMan, e_connman, E_TYPE_EXTENSION) static void -extension_set_state (EConnMan *extension, const char *state) +extension_set_state (EConnMan *extension, const gchar *state) { EExtensible *extensible; @@ -66,7 +66,7 @@ connman_monitor (DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, gpointer user_data) { - char *value; + gchar *value; EConnMan *extension = user_data; DBusError error = DBUS_ERROR_INIT; DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -98,7 +98,7 @@ connman_check_initial_state (EConnMan *extension) extension->connection, message, 100, &error); if (response != NULL) { - const char *value; + const gchar *value; if (dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID)) diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c index a5ec67d4c4..491d5068d7 100644 --- a/modules/mail/e-mail-shell-sidebar.c +++ b/modules/mail/e-mail-shell-sidebar.c @@ -178,12 +178,12 @@ mail_shell_sidebar_constructed (GObject *object) shell_sidebar); } -static int +static gint guess_screen_width (EMailShellSidebar *sidebar) { GtkWidget *widget; GdkScreen *screen; - int screen_width; + gint screen_width; widget = GTK_WIDGET (sidebar); @@ -192,12 +192,13 @@ guess_screen_width (EMailShellSidebar *sidebar) screen = gtk_widget_get_screen (widget); if (screen) { GtkWidget *toplevel; - int monitor; + gint monitor; GdkRectangle rect; toplevel = gtk_widget_get_toplevel (widget); if (toplevel && gtk_widget_get_realized (toplevel)) - monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (toplevel)); + monitor = gdk_screen_get_monitor_at_window ( + screen, gtk_widget_get_window (toplevel)); else { /* We don't know in which monitor the window manager * will put us. So we will just use the geometry of the @@ -235,16 +236,17 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition) PangoLayout *layout; PangoRectangle ink_rect; GtkStyle *style; - int border; - int sidebar_width; - int screen_width; + gint border; + gint sidebar_width; + gint screen_width; sidebar = E_MAIL_SHELL_SIDEBAR (widget); GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); /* This string is a mockup only; it doesn't need to be translated */ - layout = gtk_widget_create_pango_layout (widget, "typical.account@mailservice.com"); + layout = gtk_widget_create_pango_layout ( + widget, "typical.account@mailservice.com"); pango_layout_get_pixel_extents (layout, &ink_rect, NULL); g_object_unref (layout); @@ -252,7 +254,9 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition) screen_width = guess_screen_width (sidebar); - border = 2 * style->xthickness + 4; /* Thickness of frame shadow plus some slack for padding */ + /* Thickness of frame shadow plus some slack for padding. */ + border = 2 * style->xthickness + 4; + sidebar_width = ink_rect.width + border; sidebar_width = MIN (sidebar_width, screen_width / 4); requisition->width = MAX (requisition->width, sidebar_width); diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c index d228fc02ac..2c58b938a1 100644 --- a/modules/windows-sens/evolution-windows-sens.c +++ b/modules/windows-sens/evolution-windows-sens.c @@ -39,7 +39,7 @@ typedef struct IEnumEventObject IEnumEventObject; const IID IID_IEnumEventObject; typedef struct IEnumEventObjectVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IEnumEventObject *This,REFIID riid,void **ppvObject); + HRESULT (WINAPI *QueryInterface)(IEnumEventObject *This,REFIID riid,gpointer *ppvObject); ULONG (WINAPI *AddRef)(IEnumEventObject *This); ULONG (WINAPI *Release)(IEnumEventObject *This); HRESULT (WINAPI *Clone)(IEnumEventObject *This,IEnumEventObject **ppInterface); @@ -57,7 +57,7 @@ typedef struct IEventObjectCollection IEventObjectCollection; const IID IID_IEventObjectCollection; typedef struct IEventObjectCollectionVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IEventObjectCollection *This,REFIID riid,void **ppvObject); + HRESULT (WINAPI *QueryInterface)(IEventObjectCollection *This,REFIID riid,gpointer *ppvObject); ULONG (WINAPI *AddRef)(IEventObjectCollection *This); ULONG (WINAPI *Release)(IEventObjectCollection *This); HRESULT (WINAPI *GetTypeInfoCount)(IEventObjectCollection *This,UINT *pctinfo); @@ -76,13 +76,12 @@ struct IEventObjectCollection { CONST_VTBL struct IEventObjectCollectionVtbl *lpVtbl; }; - typedef struct IEventSystem IEventSystem; const IID IID_IEventSystem; typedef struct IEventSystemVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IEventSystem *This,REFIID riid,void **ppvObject); + HRESULT (WINAPI *QueryInterface)(IEventSystem *This,REFIID riid,gpointer *ppvObject); ULONG (WINAPI *AddRef)(IEventSystem *This); ULONG (WINAPI *Release)(IEventSystem *This); HRESULT (WINAPI *GetTypeInfoCount)(IEventSystem *This,UINT *pctinfo); @@ -106,7 +105,7 @@ typedef struct IEventSubscription IEventSubscription; const IID IID_IEventSubscription; typedef struct IEventSubscriptionVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IEventSubscription *This,REFIID riid,void **ppvObject); + HRESULT (WINAPI *QueryInterface)(IEventSubscription *This,REFIID riid,gpointer *ppvObject); ULONG (WINAPI *AddRef)(IEventSubscription *This); ULONG (WINAPI *Release)(IEventSubscription *This); HRESULT (WINAPI *GetTypeInfoCount)(IEventSubscription *This,UINT *pctinfo); @@ -175,7 +174,7 @@ typedef struct ISensNetwork ISensNetwork; const IID IID_ISensNetwork; typedef struct ISensNetworkVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(ISensNetwork *This,REFIID riid,void **ppvObject); + HRESULT (WINAPI *QueryInterface)(ISensNetwork *This,REFIID riid,gpointer *ppvObject); ULONG (WINAPI *AddRef)(ISensNetwork *This); ULONG (WINAPI *Release)(ISensNetwork *This); HRESULT (WINAPI *GetTypeInfoCount)(ISensNetwork *This,UINT *pctinfo); @@ -213,7 +212,6 @@ DEFINE_GUID(CLSID_CEventSystem, 0x4E14FBA2, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0x /* 7542e960-79c7-11d1-88f9-0080c7d771bf */ DEFINE_GUID(CLSID_CEventSubscription, 0x7542e960, 0x79c7, 0x11d1, 0x88, 0xf9, 0x00, 0x80, 0xc7, 0xd7, 0x71, 0xbf); - /* Standard GObject macros */ #define E_TYPE_WINDOWS_SENS \ (e_windows_sens_get_type ()) @@ -263,7 +261,7 @@ static void e_sens_network_listener_init(ESensNetworkListener**,EWindowsSENS*); /* Functions to implement ISensNetwork interface */ -static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork*,REFIID,void**); +static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork*,REFIID,gpointer *); static ULONG WINAPI e_sens_network_listener_addref (ISensNetwork*); static ULONG WINAPI e_sens_network_listener_release (ISensNetwork*); static HRESULT WINAPI e_sens_network_listener_gettypeinfocount (ISensNetwork*, UINT*); @@ -293,7 +291,6 @@ static ISensNetworkVtbl ESensNetworkListenerVtbl = { e_sens_network_listener_destinationreachablenoqocinfo }; - static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork *This, REFIID iid, @@ -381,7 +378,7 @@ e_sens_network_listener_connectionmade (ISensNetwork *This, } static HRESULT WINAPI -e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *This, +e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *This, BSTR bstrConnection, ULONG ulType) { @@ -438,19 +435,18 @@ e_sens_network_listener_init(ESensNetworkListener **esnl_ptr, (*esnl_ptr)->ref = 1; } - static BSTR -_mb2wchar (const char* a) +_mb2wchar (const gchar * a) { static WCHAR b[64]; MultiByteToWideChar (0, 0, a, -1, b, 64); return b; } -static const char* add_curly_braces_to_uuid (const char* string_uuid) +static const gchar * add_curly_braces_to_uuid (const gchar * string_uuid) { - static char curly_braced_uuid_string[64]; - int i; + static gchar curly_braced_uuid_string[64]; + gint i; if (!string_uuid) return NULL; lstrcpy(curly_braced_uuid_string,"{"); @@ -459,8 +455,8 @@ static const char* add_curly_braces_to_uuid (const char* string_uuid) i = strlen(curly_braced_uuid_string); lstrcat(curly_braced_uuid_string+i,"}"); return curly_braced_uuid_string; -} - +} + static void windows_sens_constructed (GObject *object) { @@ -468,22 +464,22 @@ windows_sens_constructed (GObject *object) static IEventSystem *pEventSystem =0; static IEventSubscription* pEventSubscription = 0; static ESensNetworkListener *pESensNetworkListener = 0; - static const char* eventclassid="{D5978620-5B9F-11D1-8DD2-00AA004ABD5E}"; - static const char* methods[]={ + static const gchar * eventclassid="{D5978620-5B9F-11D1-8DD2-00AA004ABD5E}"; + static const gchar * methods[]={ "ConnectionMade", "ConnectionMadeNoQOCInfo", "ConnectionLost", "DestinationReachable", "DestinationReachableNoQOCInfo" }; - static const char* names[]={ + static const gchar * names[]={ "EWS_ConnectionMade", "EWS_ConnectionMadeNoQOCInfo", "EWS_ConnectionLost", "EWS_DestinationReachable", "EWS_DestinationReachableNoQOCInfo" }; - unsigned char* subids[] = { 0, 0, 0, 0, 0 }; + guchar * subids[] = { 0, 0, 0, 0, 0 }; EWindowsSENS *extension = (E_WINDOWS_SENS (object)); e_sens_network_listener_init(&pESensNetworkListener, extension); @@ -504,7 +500,7 @@ windows_sens_constructed (GObject *object) UUID tmp_uuid; UuidCreate(&tmp_uuid); UuidToString(&tmp_uuid, &subids[i]); - res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((char*)subids[i]))); + res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *)subids[i]))); if (res) { RpcStringFree (&subids[i]); break; @@ -540,7 +536,7 @@ windows_sens_constructed (GObject *object) if (pEventSubscription) pEventSubscription->lpVtbl->Release(pEventSubscription); } - + /* Do not try to get initial state when we are sure we will not get system events. * Like that we don't get stuck with Disconnected status if we were disconnected * on start. diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 04a01cbdd5..fa917e7e79 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -395,9 +395,9 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); - gtk_table_attach (GTK_TABLE (data->parent), check, - 0, 1, n_rows, n_rows+1, - 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (data->parent), check, + 0, 1, n_rows, n_rows+1, 0, 0, 0, 0); gtk_widget_show (check); return (GtkWidget *)check; } diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 14b4e3cfdb..a3129af3a4 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -215,13 +215,19 @@ oge_caldav (EPlugin *epl, location = e_plugin_util_add_entry (parent, _("_URL:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (location), uri); - g_signal_connect (G_OBJECT (location), "changed", G_CALLBACK (location_changed_cb), source); + + g_signal_connect ( + location, "changed", + G_CALLBACK (location_changed_cb), source); ssl = e_plugin_util_add_check (parent, _("Use _SSL"), source, "ssl", "1", "0"); user = e_plugin_util_add_entry (parent, _("User_name:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (user), username ? username : ""); - g_signal_connect (G_OBJECT (user), "changed", G_CALLBACK (user_changed_cb), source); + + g_signal_connect ( + user, "changed", + G_CALLBACK (user_changed_cb), source); g_free (uri); g_free (username); @@ -229,14 +235,18 @@ oge_caldav (EPlugin *epl, browse_cal = gtk_button_new_with_mnemonic (_("Brows_e server for a calendar")); gtk_widget_show (browse_cal); g_object_get (parent, "n-rows", &n_rows, NULL); - gtk_table_attach (GTK_TABLE (parent), browse_cal, - 1, 2, n_rows, n_rows + 1, - GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (parent), browse_cal, 1, 2, + n_rows, n_rows + 1, GTK_FILL, 0, 0, 0); g_object_set_data (G_OBJECT (browse_cal), "caldav-url", location); g_object_set_data (G_OBJECT (browse_cal), "caldav-username", user); g_object_set_data (G_OBJECT (browse_cal), "caldav-ssl", ssl); - g_signal_connect (G_OBJECT (browse_cal), "clicked", G_CALLBACK (browse_cal_clicked_cb), GINT_TO_POINTER (t->source_type)); + + g_signal_connect ( + browse_cal, "clicked", + G_CALLBACK (browse_cal_clicked_cb), + GINT_TO_POINTER (t->source_type)); e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh"); diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index 9ed6b15025..7bacfb44a6 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -117,9 +117,10 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) mainbox = gtk_vbox_new (FALSE, 2); g_object_get (data->parent, "n-rows", &n_rows, NULL); - gtk_table_attach (GTK_TABLE (data->parent), mainbox, - 1, 2, n_rows, n_rows + 1, - GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (data->parent), mainbox, + 1, 2, n_rows, n_rows + 1, + GTK_EXPAND | GTK_FILL, 0, 0, 0); maincheck = gtk_check_button_new_with_mnemonic (_("_Customize options")); gtk_box_pack_start ((GtkBox *)mainbox, maincheck, TRUE, TRUE, 2); diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index dbcd501d75..f52cd8c4ae 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -939,9 +939,9 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); - gtk_table_attach (GTK_TABLE (data->parent), vbox, - 0, 1, n_rows, n_rows+1, - 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (data->parent), vbox, + 0, 1, n_rows, n_rows+1, 0, 0, 0, 0); gtk_widget_show_all (vbox); return (GtkWidget *)vbox; } diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c index 70401c1e62..3f024c4c99 100644 --- a/shell/e-shell-meego.c +++ b/shell/e-shell-meego.c @@ -40,11 +40,11 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) GdkAtom wm_win, mob_atom; Atom dummy_t; unsigned long dummy_l; - int dummy_i; + gint dummy_i; GdkScreen *screen; GdkDisplay *display; Window *wm_window_v = NULL; - unsigned char *moblin_string = NULL; + guchar *moblin_string = NULL; GModule *module; /* * Wow - this is unpleasant, but it is hard to link directly @@ -52,10 +52,10 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) * to get to the (mind-mashed) 'supporting' window. */ struct { - int (*XFree) (void *); - int (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool, - Atom, Atom *, int *, unsigned long*, - unsigned long*, unsigned char**); + gint (*XFree) (gpointer); + gint (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool, + Atom, Atom *, gint *, unsigned long*, + unsigned long*, guchar **); } fns = { 0, 0 }; *is_meego = *small_screen = FALSE; @@ -85,12 +85,12 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) gdk_error_trap_push (); /* get the window manager's supporting window */ - fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), + fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), GDK_WINDOW_XID (gdk_screen_get_root_window (screen)), gdk_x11_atom_to_xatom_for_display (display, wm_win), 0, 1, False, XA_WINDOW, &dummy_t, &dummy_i, - &dummy_l, &dummy_l, (unsigned char **)(&wm_window_v)); - + &dummy_l, &dummy_l, (guchar **)(&wm_window_v)); + /* get the '_Moblin' setting */ if (wm_window_v && (*wm_window_v != None)) fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v, @@ -102,8 +102,8 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) gdk_error_trap_pop (); if (moblin_string) { - int i; - char **props; + gint i; + gchar **props; g_warning ("prop '%s'", moblin_string); @@ -112,7 +112,7 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) props = g_strsplit ((gchar *)moblin_string, ":", -1); for (i = 0; props && props[i]; i++) { - char **pair = g_strsplit (props[i], "=", 2); + gchar **pair = g_strsplit (props[i], "=", 2); g_warning ("pair '%s'='%s'", pair ? pair[0] : "<null>", pair && pair[0] ? pair[1] : "<null>"); @@ -138,7 +138,7 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) /* gcc -g -O0 -Wall -I. -DTEST_APP `pkg-config --cflags --libs gtk+-2.0` e-shell-meego.c && ./a.out */ #include <gtk/gtk.h> -int main (int argc, char **argv) +gint main (gint argc, gchar **argv) { gboolean is_meego, small_screen; diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c index c09258b7a2..db788e20f3 100644 --- a/shell/e-shell-switcher.c +++ b/shell/e-shell-switcher.c @@ -574,7 +574,7 @@ tool_item_button_cb (GtkWidget *internal_widget, * * Adds a button to @switcher that proxies for @switcher_action. * Switcher buttons appear in the order they were added. A middle - * click opens a new window of this type. + * click opens a new window of this type. * * #EShellWindow adds switcher actions in the order given by the * <structfield>sort_order</structfield> field in #EShellBackendClass. diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index bc4084e473..a8ece91adf 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1724,7 +1724,10 @@ e_shell_view_unblock_update_actions (EShellView *shell_view) g_return_if_fail (shell_view->priv->update_actions_blocked > 0); shell_view->priv->update_actions_blocked--; - if (!shell_view->priv->update_actions_blocked && shell_view->priv->update_actions_called) { + + if (!shell_view->priv->update_actions_blocked && + shell_view->priv->update_actions_called) { + shell_view->priv->update_actions_called = FALSE; e_shell_view_update_actions (shell_view); } diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index d33be7de1d..0f94dd08ec 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1888,7 +1888,7 @@ e_shell_window_actions_init (EShellWindow *shell_window) EFocusTracker *focus_tracker; GtkUIManager *ui_manager; gchar *path; - + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); ui_manager = e_shell_window_get_ui_manager (shell_window); @@ -2113,8 +2113,8 @@ e_shell_window_create_new_menu (EShellWindow *shell_window) static GtkAction * e_shell_window_create_switcher_action (GType type, EShellViewClass *class, - const char *name, const char *tooltip, - const char *view_name) + const gchar *name, const gchar *tooltip, + const gchar *view_name) { GtkAction *action; diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index be5064a698..a2b8ccec40 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -443,7 +443,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window) gconf_bridge_bind_property (bridge, key, object, "sidebar-visible"); if (e_shell_get_express_mode (shell)) { - const char *active_view = e_shell_window_get_active_view (shell_window); + const gchar *active_view = e_shell_window_get_active_view (shell_window); e_shell_window_set_switcher_visible (shell_window, FALSE); e_shell_window_set_taskbar_visible (shell_window, active_view && !strcmp (active_view, "mail")); diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 83eb8df4ea..a3d979c07e 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -91,7 +91,7 @@ void e_calendar_set_minimum_size (ECalendar *cal, gint rows, gint cols); void e_calendar_set_maximum_size (ECalendar *cal, - gint rows, + gint rows, gint cols); void e_calendar_get_border_size (ECalendar *cal, gint *top, diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 90c42b9e44..088e4e1693 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -58,7 +58,9 @@ #define d(x) #if d(!)0 -#define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x)), g_print ("%s: e_table_item_leave_edit\n", __FUNCTION__)) +#define e_table_item_leave_edit_(x) \ + (e_table_item_leave_edit ((x)), \ + g_print ("%s: e_table_item_leave_edit\n", __FUNCTION__)) #else #define e_table_item_leave_edit_(x) (e_table_item_leave_edit((x))) #endif @@ -199,7 +201,9 @@ e_table_state_change (ETable *et) g_signal_emit (G_OBJECT (et), et_signals [STATE_CHANGE], 0); } -#define CHECK_HORIZONTAL(et) if ((et)->horizontal_scrolling || (et)->horizontal_resize) e_table_header_update_horizontal (et->header); +#define CHECK_HORIZONTAL(et) \ + if ((et)->horizontal_scrolling || (et)->horizontal_resize) \ + e_table_header_update_horizontal (et->header); static void clear_current_search_col (ETable *et) @@ -288,7 +292,8 @@ connect_header (ETable *e_table, ETableState *state) if (e_table->header != NULL) disconnect_header (e_table); - e_table->header = e_table_state_to_header (GTK_WIDGET(e_table), e_table->full_header, state); + e_table->header = e_table_state_to_header ( + GTK_WIDGET (e_table), e_table->full_header, state); e_table->structure_change_id = g_signal_connect (G_OBJECT (e_table->header), "structure_change", @@ -409,7 +414,11 @@ et_unrealize (GtkWidget *widget) } static gboolean -check_row (ETable *et, gint model_row, gint col, ETableSearchFunc search, gchar *string) +check_row (ETable *et, + gint model_row, + gint col, + ETableSearchFunc search, + gchar *string) { gconstpointer value; @@ -419,7 +428,10 @@ check_row (ETable *et, gint model_row, gint col, ETableSearchFunc search, gchar } static gboolean -et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, ETable *et) +et_search_search (ETableSearch *search, + gchar *string, + ETableSearchFlags flags, + ETable *et) { gint cursor; gint rows; @@ -435,7 +447,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, "cursor_row", &cursor, NULL); - if ((flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && cursor < rows && cursor >= 0 && check_row (et, cursor, col->col_idx, col->search, string)) + if ((flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && + cursor < rows && cursor >= 0 && + check_row (et, cursor, col->col_idx, col->search, string)) return TRUE; cursor = e_sorter_model_to_sorted (E_SORTER (et->sorter), cursor); @@ -443,7 +457,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, for (i = cursor + 1; i < rows; i++) { gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); if (check_row (et, model_row, col->col_idx, col->search, string)) { - e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK); + e_selection_model_select_as_key_press ( + E_SELECTION_MODEL (et->selection), + model_row, col->col_idx, GDK_CONTROL_MASK); return TRUE; } } @@ -451,7 +467,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, for (i = 0; i < cursor; i++) { gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); if (check_row (et, model_row, col->col_idx, col->search, string)) { - e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK); + e_selection_model_select_as_key_press ( + E_SELECTION_MODEL (et->selection), + model_row, col->col_idx, GDK_CONTROL_MASK); return TRUE; } } @@ -459,7 +477,9 @@ et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, cursor = e_sorter_sorted_to_model (E_SORTER (et->sorter), cursor); /* Check if the cursor row is the only matching row. */ - return (!(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && cursor < rows && cursor >= 0 && check_row (et, cursor, col->col_idx, col->search, string)); + return (!(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) && + cursor < rows && cursor >= 0 && + check_row (et, cursor, col->col_idx, col->search, string)); } static void @@ -471,10 +491,10 @@ et_search_accept (ETableSearch *search, ETable *et) if (col == NULL) return; - g_object_get(et->selection, - "cursor_row", &cursor, - NULL); - e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), cursor, col->col_idx, 0); + g_object_get (et->selection, "cursor_row", &cursor, NULL); + + e_selection_model_select_as_key_press ( + E_SELECTION_MODEL (et->selection), cursor, col->col_idx, 0); } static void @@ -749,7 +769,9 @@ static void table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table) { if (!e_table->reflow_idle_id) - e_table->reflow_idle_id = g_idle_add_full (400, (GSourceFunc) table_canvas_reflow_idle, e_table, NULL); + e_table->reflow_idle_id = g_idle_add_full ( + 400, (GSourceFunc) table_canvas_reflow_idle, + e_table, NULL); } static void @@ -791,7 +813,11 @@ static gboolean group_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { gboolean return_val = FALSE; - g_signal_emit (G_OBJECT (et), et_signals [RIGHT_CLICK], 0, row, col, event, &return_val); + + g_signal_emit ( + et, et_signals[RIGHT_CLICK], 0, + row, col, event, &return_val); + return return_val; } @@ -834,7 +860,9 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable * row_local = e_table_view_to_model_row (et, row_local); col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection)); - e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state); + e_selection_model_select_as_key_press ( + E_SELECTION_MODEL (et->selection), + row_local, col_local, key->state); return_val = 1; break; case GDK_Page_Up: @@ -852,7 +880,9 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable * row_local = e_table_view_to_model_row (et, row_local); col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection)); - e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state); + e_selection_model_select_as_key_press ( + E_SELECTION_MODEL (et->selection), + row_local, col_local, key->state); return_val = 1; break; case GDK_BackSpace: @@ -862,7 +892,9 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable * /* Fall through */ default: init_search (et); - if ((key->state & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)) == 0 + if ((key->state & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | + GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | + GDK_MOD4_MASK | GDK_MOD5_MASK)) == 0 && ((key->keyval >= GDK_a && key->keyval <= GDK_z) || (key->keyval >= GDK_A && key->keyval <= GDK_Z) || (key->keyval >= GDK_0 && key->keyval <= GDK_9))) @@ -954,20 +986,25 @@ et_build_groups (ETable *et) 0); if (et->use_click_to_add_end) - e_canvas_vbox_add_item_start(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); + e_canvas_vbox_add_item_start ( + E_CANVAS_VBOX (et->canvas_vbox), + GNOME_CANVAS_ITEM (et->group)); else - e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group)); - - gnome_canvas_item_set(GNOME_CANVAS_ITEM(et->group), - "alternating_row_colors", et->alternating_row_colors, - "horizontal_draw_grid", et->horizontal_draw_grid, - "vertical_draw_grid", et->vertical_draw_grid, - "drawfocus", et->draw_focus, - "cursor_mode", et->cursor_mode, - "length_threshold", et->length_threshold, - "uniform_row_height", et->uniform_row_height, - "selection_model", et->selection, - NULL); + e_canvas_vbox_add_item ( + E_CANVAS_VBOX (et->canvas_vbox), + GNOME_CANVAS_ITEM (et->group)); + + gnome_canvas_item_set ( + GNOME_CANVAS_ITEM(et->group), + "alternating_row_colors", et->alternating_row_colors, + "horizontal_draw_grid", et->horizontal_draw_grid, + "vertical_draw_grid", et->vertical_draw_grid, + "drawfocus", et->draw_focus, + "cursor_mode", et->cursor_mode, + "length_threshold", et->length_threshold, + "uniform_row_height", et->uniform_row_height, + "selection_model", et->selection, + NULL); g_signal_connect (G_OBJECT (et->group), "cursor_change", G_CALLBACK (group_cursor_change), et); @@ -988,20 +1025,25 @@ et_build_groups (ETable *et) et_disconnect_model (et); if (et->is_grouped && (!was_grouped)) { - et->table_model_change_id = g_signal_connect (G_OBJECT (et->model), "model_changed", - G_CALLBACK (et_table_model_changed), et); + et->table_model_change_id = g_signal_connect ( + et->model, "model_changed", + G_CALLBACK (et_table_model_changed), et); - et->table_row_change_id = g_signal_connect (G_OBJECT (et->model), "model_row_changed", - G_CALLBACK (et_table_row_changed), et); + et->table_row_change_id = g_signal_connect ( + et->model, "model_row_changed", + G_CALLBACK (et_table_row_changed), et); - et->table_cell_change_id = g_signal_connect (G_OBJECT (et->model), "model_cell_changed", - G_CALLBACK (et_table_cell_changed), et); + et->table_cell_change_id = g_signal_connect ( + et->model, "model_cell_changed", + G_CALLBACK (et_table_cell_changed), et); - et->table_rows_inserted_id = g_signal_connect (G_OBJECT (et->model), "model_rows_inserted", - G_CALLBACK (et_table_rows_inserted), et); + et->table_rows_inserted_id = g_signal_connect ( + et->model, "model_rows_inserted", + G_CALLBACK (et_table_rows_inserted), et); - et->table_rows_deleted_id = g_signal_connect (G_OBJECT (et->model), "model_rows_deleted", - G_CALLBACK (et_table_rows_deleted), et); + et->table_rows_deleted_id = g_signal_connect ( + et->model, "model_rows_deleted", + G_CALLBACK (et_table_rows_deleted), et); } @@ -1577,7 +1619,9 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, e_table->use_click_to_add = specification->click_to_add; e_table->use_click_to_add_end = specification->click_to_add_end; - e_table->click_to_add_message = specification->click_to_add_message ? g_strdup (dgettext (e_table->domain, specification->click_to_add_message)) : NULL; + e_table->click_to_add_message = specification->click_to_add_message ? + g_strdup (dgettext (e_table->domain, + specification->click_to_add_message)) : NULL; e_table->alternating_row_colors = specification->alternating_row_colors; e_table->horizontal_draw_grid = specification->horizontal_draw_grid; e_table->vertical_draw_grid = specification->vertical_draw_grid; @@ -1813,7 +1857,10 @@ e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtra * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * -e_table_new (ETableModel *etm, ETableExtras *ete, const gchar *spec, const gchar *state) +e_table_new (ETableModel *etm, + ETableExtras *ete, + const gchar *spec, + const gchar *state) { ETable *e_table; @@ -1850,7 +1897,10 @@ e_table_new (ETableModel *etm, ETableExtras *ete, const gchar *spec, const gchar * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * -e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const gchar *spec_fn, const gchar *state_fn) +e_table_new_from_spec_file (ETableModel *etm, + ETableExtras *ete, + const gchar *spec_fn, + const gchar *state_fn) { ETable *e_table; @@ -2445,8 +2495,10 @@ e_table_get_cell_at (ETable *table, * @table: The #ETable. * @row: The row to get the geometry of. * @col: The col to get the geometry of. - * @x_return: Returns the x coordinate of the upper left hand corner of the cell with respect to the widget. - * @y_return: Returns the y coordinate of the upper left hand corner of the cell with respect to the widget. + * @x_return: Returns the x coordinate of the upper left hand corner + * of the cell with respect to the widget. + * @y_return: Returns the y coordinate of the upper left hand corner + * of the cell with respect to the widget. * @width_return: Returns the width of the cell. * @height_return: Returns the height of the cell. * @@ -2493,7 +2545,9 @@ e_table_get_cell_geometry (ETable *table, /** * e_table_get_mouse_over_cell: - * Similar to e_table_get_cell_at, only here we check based on the mouse motion information in the group. + * + * Similar to e_table_get_cell_at, only here we check + * based on the mouse motion information in the group. **/ void e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col) @@ -3466,7 +3520,8 @@ e_table_class_init (ETableClass *class) 0, G_MAXINT, 3, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); gal_a11y_e_table_init (); } |