aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-25 22:15:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-25 22:15:32 +0800
commit96538878911586a9e9ca26b81e1916c04e538980 (patch)
treeffcfe184bab289d6917a65d850bc4ba310be0447 /widgets
parent3e1b34841d3a699f77848f5de019f18ccb2d1ca1 (diff)
downloadgsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.gz
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.bz2
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.lz
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.xz
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.zst
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-account-combo-box.c4
-rw-r--r--widgets/misc/e-account-combo-box.h2
-rw-r--r--widgets/misc/e-calendar.h2
-rw-r--r--widgets/misc/e-preferences-window.c23
4 files changed, 17 insertions, 14 deletions
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 786478a5e3..288ac408fb 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -41,7 +41,7 @@ enum {
struct _EAccountComboBoxPrivate {
EAccountList *account_list;
GHashTable *index;
- int num_displayed_accounts;
+ gint num_displayed_accounts;
};
static gpointer parent_class;
@@ -529,7 +529,7 @@ e_account_combo_box_set_active_name (EAccountComboBox *combo_box,
*
* Return value: number of active and valid accounts as shown in the @combo_box.
*/
-int
+gint
e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box)
{
g_return_val_if_fail (E_IS_ACCOUNT_COMBO_BOX (combo_box), -1);
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 60078690e9..c3fe4aa0f8 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -78,7 +78,7 @@ gboolean e_account_combo_box_set_active_name
(EAccountComboBox *combo_box,
const gchar *account_name);
-int e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box);
+gint e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box);
G_END_DECLS
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/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index d6ee321f5d..9390f047ca 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -39,7 +39,7 @@ struct _EPreferencesWindowPrivate {
GtkListStore *store;
GtkTreeModelFilter *filter;
- const char *filter_view;
+ const gchar *filter_view;
};
enum {
@@ -213,19 +213,19 @@ filter_view (GtkTreeModel *model,
/* Show everything except calendar */
if (str && (strncmp (str, "cal", 3) == 0))
visible = FALSE;
- else
+ else
visible = TRUE;
} else if (strncmp(window->priv->filter_view, "cal", 3) == 0) {
/* Show only calendar and nothing else */
if (str && (strncmp (str, "cal", 3) != 0))
visible = FALSE;
- else
+ else
visible = TRUE;
} else /* In any other case, show everything */
visible = TRUE;
-
- g_free (str);
+
+ g_free (str);
return visible;
}
@@ -252,13 +252,16 @@ preferences_window_init (EPreferencesWindow *window)
window->priv->filter_view = NULL;
store = gtk_list_store_new (
- 5, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT);
+ 5, G_TYPE_STRING, G_TYPE_STRING,
+ GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT);
gtk_tree_sortable_set_sort_column_id (
GTK_TREE_SORTABLE (store), COLUMN_SORT, GTK_SORT_ASCENDING);
window->priv->store = store;
- window->priv->filter = (GtkTreeModelFilter *)gtk_tree_model_filter_new ((GtkTreeModel *)store, NULL);
- gtk_tree_model_filter_set_visible_func (window->priv->filter, filter_view, window, NULL);
+ window->priv->filter = (GtkTreeModelFilter *)
+ gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+ gtk_tree_model_filter_set_visible_func (
+ window->priv->filter, filter_view, window, NULL);
title = _("Evolution Preferences");
gtk_window_set_title (GTK_WINDOW (window), title);
@@ -290,7 +293,7 @@ preferences_window_init (EPreferencesWindow *window)
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
window->priv->scroll = widget;
gtk_widget_show (widget);
-
+
container = widget;
widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (window->priv->filter));
@@ -476,7 +479,7 @@ e_preferences_window_filter_page (EPreferencesWindow *window,
window->priv->filter_view = page_name;
gtk_tree_model_filter_refilter (window->priv->filter);
- /* XXX: We need a better solution to hide the icon view when
+ /* XXX: We need a better solution to hide the icon view when
* there is just one entry */
if (strncmp(page_name, "cal", 3) == 0) {
gtk_widget_hide (window->priv->scroll);