From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- calendar/gui/e-meeting-list-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 2d8a532727..c903c97c23 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- calendar/gui/e-meeting-list-view.c | 78 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index c903c97c23..8567aa07fa 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -122,7 +122,7 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass) static void -add_section (ENameSelector *name_selector, const char *name) +add_section (ENameSelector *name_selector, const gchar *name) { ENameSelectorModel *name_selector_model; @@ -160,11 +160,11 @@ get_type_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Individual")); - strings = g_list_append (strings, (char*) _("Group")); - strings = g_list_append (strings, (char*) _("Resource")); - strings = g_list_append (strings, (char*) _("Room")); - strings = g_list_append (strings, (char*) _("Unknown")); + strings = g_list_append (strings, (gchar *) _("Individual")); + strings = g_list_append (strings, (gchar *) _("Group")); + strings = g_list_append (strings, (gchar *) _("Resource")); + strings = g_list_append (strings, (gchar *) _("Room")); + strings = g_list_append (strings, (gchar *) _("Unknown")); return strings; } @@ -174,11 +174,11 @@ get_role_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Chair")); - strings = g_list_append (strings, (char*) _("Required Participant")); - strings = g_list_append (strings, (char*) _("Optional Participant")); - strings = g_list_append (strings, (char*) _("Non-Participant")); - strings = g_list_append (strings, (char*) _("Unknown")); + strings = g_list_append (strings, (gchar *) _("Chair")); + strings = g_list_append (strings, (gchar *) _("Required Participant")); + strings = g_list_append (strings, (gchar *) _("Optional Participant")); + strings = g_list_append (strings, (gchar *) _("Non-Participant")); + strings = g_list_append (strings, (gchar *) _("Unknown")); return strings; } @@ -188,8 +188,8 @@ get_rsvp_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Yes")); - strings = g_list_append (strings, (char*) _("No")); + strings = g_list_append (strings, (gchar *) _("Yes")); + strings = g_list_append (strings, (gchar *) _("No")); return strings; } @@ -199,11 +199,11 @@ get_status_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Needs Action")); - strings = g_list_append (strings, (char*) _("Accepted")); - strings = g_list_append (strings, (char*) _("Declined")); - strings = g_list_append (strings, (char*) _("Tentative")); - strings = g_list_append (strings, (char*) _("Delegated")); + strings = g_list_append (strings, (gchar *) _("Needs Action")); + strings = g_list_append (strings, (gchar *) _("Accepted")); + strings = g_list_append (strings, (gchar *) _("Declined")); + strings = g_list_append (strings, (gchar *) _("Tentative")); + strings = g_list_append (strings, (gchar *) _("Delegated")); return strings; } @@ -213,7 +213,7 @@ value_edited (GtkTreeView *view, gint col, const gchar *path, const gchar *text) { EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *treepath = gtk_tree_path_new_from_string (path); - int row = gtk_tree_path_get_indices (treepath)[0]; + gint row = gtk_tree_path_get_indices (treepath)[0]; e_meeting_store_set_value (model, row, col, text); gtk_tree_path_free (treepath); @@ -264,7 +264,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, GList *destinations, *l; EDestinationStore *destination_store; ENameSelectorModel *name_selector_model; - const char *madd = NULL; + const gchar *madd = NULL; EMeetingListViewPrivate *priv; guint i = 1; @@ -278,7 +278,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, madd = itip_strip_mailto (e_meeting_attendee_get_address (ma)); for (l = destinations; l; l = g_list_next (l)) { - const char *attendee = NULL; + const gchar *attendee = NULL; EDestination *des = l->data; @@ -354,7 +354,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address { EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *treepath = gtk_tree_path_new_from_string (path); - int row = gtk_tree_path_get_indices (treepath)[0]; + gint row = gtk_tree_path_get_indices (treepath)[0]; EMeetingAttendee *existing_attendee; gboolean removed = FALSE, address_changed = FALSE; @@ -365,7 +365,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address GList *l, *m; for (l = addresses, m = names; l && m; l = l->next, m = m->next) { - char *name = m->data, *email = l->data; + gchar *name = m->data, *email = l->data; if (!((name && *name) || (email && *email))) continue; @@ -374,7 +374,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address continue; attendee = e_meeting_store_add_attendee_with_defaults (model); - e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *)l->data)); + e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *)l->data)); e_meeting_attendee_set_cn (attendee, g_strdup (m->data)); if (existing_attendee) { /* FIXME Should we copy anything else? */ @@ -395,8 +395,8 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address } } else if (g_list_length (addresses) == 1) { - char *name = names->data, *email = addresses->data; - int existing_row; + gchar *name = names->data, *email = addresses->data; + gint existing_row; if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){ if (existing_attendee) { @@ -430,7 +430,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address } } else { if (existing_attendee) { - const char *address = e_meeting_attendee_get_address (existing_attendee); + const gchar *address = e_meeting_attendee_get_address (existing_attendee); if (!(address && *address)) { removed = TRUE; @@ -456,7 +456,7 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view) EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *path; EMeetingAttendee *existing_attendee; - int row; + gint row; /* This is for newly added attendees when the editing is cancelled */ gtk_tree_view_get_cursor (view, &path, NULL); @@ -534,7 +534,7 @@ build_table (EMeetingListView *lview) EMeetingListViewPrivate *priv; GHashTable *edit_table; GtkTreeViewColumn *col; - int pos; + gint pos; priv = lview->priv; edit_table = priv->renderers; @@ -618,7 +618,7 @@ static void change_edit_cols_for_user (gpointer key, gpointer value, gpointer user_data) { GtkCellRenderer *renderer = (GtkCellRenderer *) value; - int key_val = GPOINTER_TO_INT (key); + gint key_val = GPOINTER_TO_INT (key); switch (key_val) { case E_MEETING_STORE_ATTENDEE_COL: @@ -652,7 +652,7 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) { EMeetingAttendee *existing_attendee; EMeetingListViewPrivate *priv; - int row; + gint row; EMeetingAttendeeEditLevel el; gint edit_level; GtkTreeModel *model; @@ -776,7 +776,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role ENameSelectorDialog *dialog; EContactStore *c_store; GList *books, *l; - char *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); + gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); dialog = e_name_selector_peek_dialog (view->priv->name_selector); c_store = dialog->name_selector_model->contact_store; @@ -793,11 +793,11 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role if (book) { GList *contacts; EContact *n_con = NULL; - char *qu; + gchar *qu; EBookQuery *query; qu = g_strdup_printf ("(is \"full_name\" \"%s\")", - (char *) e_contact_get (contact, E_CONTACT_FULL_NAME)); + (gchar *) e_contact_get (contact, E_CONTACT_FULL_NAME)); query = e_book_query_from_string (qu); if (!e_book_get_contacts (book, query, &contacts, NULL)) { @@ -829,8 +829,8 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role for (l = list_dests; l; l = l->next) { EDestination *dest = l->data; EContact *contact; - const char *name, *attendee = NULL; - char *attr = NULL, *fburi = NULL; + const gchar *name, *attendee = NULL; + gchar *attr = NULL, *fburi = NULL; name = e_destination_get_name (dest); @@ -907,7 +907,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin ENameSelectorModel *name_selector_model; EMeetingStore *store; const GPtrArray *attendees; - int i; + gint i; GSList *la = NULL, *l; name_selector_model = e_name_selector_peek_model (view->priv->name_selector); @@ -936,8 +936,8 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin /* remove the deleted attendees from name selector */ for (l = la; l != NULL; l = l->next) { EMeetingAttendee *ma = NULL; - const char *email = l->data; - int i; + const gchar *email = l->data; + gint i; ma = e_meeting_store_find_attendee (store, email, &i); -- cgit v1.2.3 From 14f8eee012382f04090ea9277e9567d5f32e8bf0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 13:06:29 -0400 Subject: Whitespace cleanup. --- calendar/gui/e-meeting-list-view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 8567aa07fa..924ab6720d 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -15,7 +15,7 @@ * * Authors: * Mike Kestner - * JP Rosevear + * JP Rosevear * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -97,7 +97,7 @@ e_meeting_list_view_finalize (GObject *obj) g_free (priv); if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) - (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj); + (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj); } static void @@ -150,7 +150,7 @@ e_meeting_list_view_init (EMeetingListView *view) name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector); gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Attendees")); - g_signal_connect (name_selector_dialog, "response", + g_signal_connect (name_selector_dialog, "response", G_CALLBACK (name_selector_dialog_close_cb), view); } @@ -908,7 +908,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin EMeetingStore *store; const GPtrArray *attendees; gint i; - GSList *la = NULL, *l; + GSList *la = NULL, *l; name_selector_model = e_name_selector_peek_model (view->priv->name_selector); store = E_MEETING_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); -- cgit v1.2.3 From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- calendar/gui/e-meeting-list-view.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 924ab6720d..55e3af816e 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -120,7 +120,6 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass) G_TYPE_POINTER); } - static void add_section (ENameSelector *name_selector, const gchar *name) { @@ -281,7 +280,6 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, const gchar *attendee = NULL; EDestination *des = l->data; - if (e_destination_is_evolution_list (des)) { GList *l, *dl; @@ -473,7 +471,6 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view) gtk_tree_path_free (path); } - static void type_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view) { @@ -661,7 +658,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) priv = view->priv; - if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model))) return; if (g_list_length (paths) > 1) @@ -694,7 +690,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) } - EMeetingListView * e_meeting_list_view_new (EMeetingStore *store) { @@ -863,7 +858,6 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role if (contact) fburi = e_contact_get (contact, E_CONTACT_FREEBUSY_URL); - if (e_meeting_store_find_attendee (priv->store, attendee, NULL) == NULL) { EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults (priv->store); @@ -1003,4 +997,3 @@ e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *n priv->name_selector = g_object_ref (name_selector); } - -- cgit v1.2.3 From fa360fde289f9b850191f89059d1a5e6d67c07c7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Jul 2009 14:07:42 -0400 Subject: More whitespace cleanup. --- calendar/gui/e-meeting-list-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 55e3af816e..d4b87fc270 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -396,7 +396,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address gchar *name = names->data, *email = addresses->data; gint existing_row; - if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){ + if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)) { if (existing_attendee) { removed = TRUE; e_meeting_list_view_remove_attendee_from_name_selector (E_MEETING_LIST_VIEW (view), -- cgit v1.2.3 From 9abce979580857b9273ee9efc909bfd1d3004e51 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Aug 2009 18:12:38 -0400 Subject: Remove some unnecessary Bonobo includes. --- calendar/gui/e-meeting-list-view.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index d4b87fc270..276c31ab01 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -27,9 +27,6 @@ #include #include -#include -#include -#include #include #include #include -- cgit v1.2.3 From 3b0699fc304d0f4aecb261d19869de221f5d6abf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Aug 2009 21:43:09 -0400 Subject: More refactoring of settings management. --- calendar/gui/e-meeting-list-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-meeting-list-view.c') diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 276c31ab01..32aa1d3a0e 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -827,7 +827,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role name = e_destination_get_name (dest); /* Get the field as attendee from the backend */ - if (e_cal_get_ldap_attribute (e_meeting_store_get_e_cal (priv->store), + if (e_cal_get_ldap_attribute (e_meeting_store_get_client (priv->store), &attr, NULL)) { /* FIXME this should be more general */ if (!g_ascii_strcasecmp (attr, "icscalendar")) { -- cgit v1.2.3