aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-06-02 07:09:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-02 07:09:19 +0800
commit8771a6de3590d468d1a2c3cfab34955c624f614a (patch)
treedc23ed6ab0533bc9f241976f33b6c6cc2d7ee117 /addressbook/gui/widgets
parent69a1e923a71ee881721e21b991de08b897f9e7b0 (diff)
downloadgsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.gz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.bz2
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.lz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.xz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.zst
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.zip
More code cleanup.
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-reflow-adapter.c10
-rw-r--r--addressbook/gui/widgets/e-addressbook-table-adapter.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c4
-rw-r--r--addressbook/gui/widgets/e-minicard-view.c4
-rw-r--r--addressbook/gui/widgets/e-minicard.c2
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c10
-rw-r--r--addressbook/gui/widgets/eab-popup-control.c2
-rw-r--r--addressbook/gui/widgets/gal-view-minicard.c14
9 files changed, 27 insertions, 27 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 2176fc3915..7389cdc8c6 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -188,7 +188,7 @@ create_contact(EBookView *book_view,
model->data = g_renew(EContact *, model->data, model->allocated_count);
}
- for ( ; contacts; contacts = contacts->next) {
+ for (; contacts; contacts = contacts->next) {
model->data[model->data_count++] = contacts->data;
g_object_ref (contacts->data);
}
@@ -235,7 +235,7 @@ modify_contact(EBookView *book_view,
const GList *contacts,
EABModel *model)
{
- for ( ; contacts; contacts = contacts->next) {
+ for (; contacts; contacts = contacts->next) {
gint i;
for ( i = 0; i < model->data_count; i++) {
if ( !strcmp(e_contact_get_const(model->data[i], E_CONTACT_UID),
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 6258ed28ca..56f64e158b 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -98,7 +98,7 @@ unlink_model(EAddressbookReflowAdapter *adapter)
}
-static int
+static gint
text_height (PangoLayout *layout, const gchar *text)
{
gint height;
@@ -124,7 +124,7 @@ addressbook_set_width (EReflowModel *erm, gint width)
}
/* This function returns the number of items in our EReflowModel. */
-static int
+static gint
addressbook_count (EReflowModel *erm)
{
EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -134,7 +134,7 @@ addressbook_count (EReflowModel *erm)
}
/* This function returns the height of the minicontact in question */
-static int
+static gint
addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
{
EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -180,7 +180,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
return height;
}
-static int
+static gint
addressbook_compare (EReflowModel *erm, gint n1, gint n2)
{
EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
@@ -222,7 +222,7 @@ addressbook_compare (EReflowModel *erm, gint n1, gint n2)
}
}
-static int
+static gint
adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
{
gint ret_val = 0;
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 59e670e772..f285d76493 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -87,14 +87,14 @@ addressbook_dispose(GObject *object)
}
/* This function returns the number of columns in our ETableModel. */
-static int
+static gint
addressbook_col_count (ETableModel *etc)
{
return COLS;
}
/* This function returns the number of rows in our ETableModel. */
-static int
+static gint
addressbook_row_count (ETableModel *etc)
{
EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc);
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index ed726db613..53cd6aadec 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1447,7 +1447,7 @@ query_changed (ESearchBar *esb, EABView *view)
}
}
-static int
+static gint
compare_subitems (gconstpointer a, gconstpointer b)
{
const ESearchBarItem *subitem_a = a;
@@ -1946,7 +1946,7 @@ void
eab_view_save_as (EABView *view, gboolean all)
{
GList *list = NULL;
- EBook *book ;
+ EBook *book;
g_object_get(view->model,
"book", &book,
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 8cb68bb504..9461dca3ae 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -123,7 +123,7 @@ clear_drag_data (EMinicardView *view)
view->drag_list = NULL;
}
-static int
+static gint
e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
{
GdkDragContext *context;
@@ -477,7 +477,7 @@ do_remove (gint i, gpointer user_data)
}
#if 0
-static int
+static gint
compare_to_utf_str (EMinicard *card, const gchar *utf_str)
{
g_return_val_if_fail(card != NULL, 0);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 30f326402a..1a021bea04 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -903,7 +903,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, g
g_list_free (emails);
}
-static int
+static gint
get_left_width (EMinicard *e_minicard, gboolean is_list)
{
gchar *name;
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 1e39b10cf0..40e75523cc 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -188,11 +188,11 @@ eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data)
}
}
-static int
+static gint
eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const gchar *uri)
{
EABPopup *emp;
- EABPopupTargetURI *t ;
+ EABPopupTargetURI *t;
GtkMenu *menu;
GSList *menus = NULL;
gint i;
@@ -801,8 +801,8 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
max_dimension = calced_height;
if (max_dimension > MAX_COMPACT_IMAGE_DIMENSION) {
- calced_width *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
- calced_height *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
+ calced_width *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
+ calced_height *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension);
}
}
@@ -923,7 +923,7 @@ eab_contact_display_render (EABContactDisplay *display, EContact *contact,
}
}
-static int
+static gint
eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *display)
{
gchar *uri;
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index e56b816af2..78b99cf6a4 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -355,7 +355,7 @@ eab_popup_control_query (EABPopupControl *pop)
g_object_ref (pop);
- eab_popup_control_no_matches (pop) ;
+ eab_popup_control_no_matches (pop);
g_object_unref (pop);
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index ae9b916e54..8ff48bede6 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -122,15 +122,15 @@ gal_view_minicard_class_init (GObjectClass *object_class)
GalViewClass *gal_view_class = GAL_VIEW_CLASS(object_class);
gal_view_minicard_parent_class = g_type_class_ref (PARENT_TYPE);
- gal_view_class->edit = NULL ;
- gal_view_class->load = gal_view_minicard_load ;
- gal_view_class->save = gal_view_minicard_save ;
- gal_view_class->get_title = gal_view_minicard_get_title ;
- gal_view_class->set_title = gal_view_minicard_set_title ;
+ gal_view_class->edit = NULL;
+ gal_view_class->load = gal_view_minicard_load;
+ gal_view_class->save = gal_view_minicard_save;
+ gal_view_class->get_title = gal_view_minicard_get_title;
+ gal_view_class->set_title = gal_view_minicard_set_title;
gal_view_class->get_type_code = gal_view_minicard_get_type_code;
- gal_view_class->clone = gal_view_minicard_clone ;
+ gal_view_class->clone = gal_view_minicard_clone;
- object_class->dispose = gal_view_minicard_dispose ;
+ object_class->dispose = gal_view_minicard_dispose;
}
static void