From dcf2c0e754d6e251733cea74c2427738122620af Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Jul 2009 14:05:05 -0400 Subject: More whitespace cleanup. --- addressbook/gui/widgets/e-addressbook-model.c | 2 +- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/e-minicard-label.c | 4 ++-- addressbook/gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/e-minicard-view.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 10 +++++----- addressbook/gui/widgets/eab-contact-display.c | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 965beb7e27..786c4d994d 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -566,7 +566,7 @@ eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GPa model = EAB_MODEL (object); - switch (prop_id){ + switch (prop_id) { case PROP_BOOK: if (model->book) { if (model->writable_status_id) diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 4a85b69fa4..536d065c10 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -148,7 +148,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent) height = text_height (layout, string ? string : "") + 10.0; g_free(string); - for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) { + for (field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING && count < 5; field++) { if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME) continue; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 7805cb19f8..25e55666d4 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -671,7 +671,7 @@ eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GPar { EABView *eav = EAB_VIEW(object); - switch (prop_id){ + switch (prop_id) { case PROP_BOOK: if (eav->book) { g_object_unref (eav->book); @@ -1731,7 +1731,7 @@ eab_view_print (EABView *view, GtkPrintOperationAction action) */ static void delete_contacts_cb (EBook *book, EBookStatus status, gpointer closure) { - switch(status) { + switch (status) { case E_BOOK_ERROR_OK : case E_BOOK_ERROR_CANCELLED : break; diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 414b760e1e..074bf9f8e3 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -205,7 +205,7 @@ e_minicard_label_set_property (GObject *object, guint prop_id, const GValue *va e_minicard_label = E_MINICARD_LABEL (object); item = GNOME_CANVAS_ITEM (object); - switch (prop_id){ + switch (prop_id) { case PROP_WIDTH: e_minicard_label->width = g_value_get_double (value); e_minicard_label_resize_children(e_minicard_label); @@ -347,7 +347,7 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard_label = E_MINICARD_LABEL (item); - switch( event->type ) { + switch ( event->type ) { case GDK_KEY_PRESS: if (event->key.keyval == GDK_Escape) { GnomeCanvasItem *parent; diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 7a95d5ecb5..62778b4bf3 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -200,7 +200,7 @@ e_minicard_view_widget_set_property (GObject *object, emvw = E_MINICARD_VIEW_WIDGET (object); - switch (prop_id){ + switch (prop_id) { case PROP_BOOK: if (emvw->book) g_object_unref (emvw->book); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index cf0e511aeb..c33b1f3045 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -225,7 +225,7 @@ e_minicard_view_set_property (GObject *object, view = E_MINICARD_VIEW (object); - switch (prop_id){ + switch (prop_id) { case PROP_ADAPTER: if (view->adapter) { if (view->writable_status_id || view->stop_state_id) { @@ -375,7 +375,7 @@ e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event) view = E_MINICARD_VIEW (item); - switch( event->type ) { + switch ( event->type ) { case GDK_2BUTTON_PRESS: if (((GdkEventButton *)event)->button == 1) { gboolean editable; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 41c6ac6809..c4568aac3b 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -303,7 +303,7 @@ e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, G item = GNOME_CANVAS_ITEM (object); e_minicard = E_MINICARD (object); - switch (prop_id){ + switch (prop_id) { case PROP_WIDTH: if (e_minicard->width != g_value_get_double (value)) { e_minicard->width = g_value_get_double (value); @@ -578,7 +578,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard = E_MINICARD (item); - switch( event->type ) { + switch ( event->type ) { case GDK_FOCUS_CHANGE: { GdkEventFocus *focus_event = (GdkEventFocus *) event; @@ -910,7 +910,7 @@ get_left_width (EMinicard *e_minicard, gboolean is_list) return 0; layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), ""); - for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) { + for (field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) { gint this_width; if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME) @@ -960,7 +960,7 @@ remodel( EMinicard *e_minicard ) list = e_minicard->fields; e_minicard->fields = NULL; - for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) && count < 5; field++) { + for (field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) && count < 5; field++) { EMinicardField *minicard_field = NULL; gboolean is_email=FALSE; @@ -1050,7 +1050,7 @@ e_minicard_reflow(GnomeCanvasItem *item, gint flags) "y2", text_height + 9.0, NULL); - for(list = e_minicard->fields; list; list = g_list_next(list)) { + for (list = e_minicard->fields; list; list = g_list_next(list)) { EMinicardField *field = E_MINICARD_FIELD(list->data); /* Why not use the item that is passed in? */ GnomeCanvasItem *item = field->label; diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index c7d80b4d51..bea167cc45 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -100,7 +100,7 @@ eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, gpointer data) email_list = e_contact_get (p->contact, E_CONTACT_EMAIL); for (l = email_list; l; l=l->next) { - if(i==email_num) + if (i==email_num) html = e_text_to_html (l->data, 0); i++; } @@ -175,7 +175,7 @@ static EPopupItem eab_uri_popups[] = { static void eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data) { - while (list){ + while (list) { GSList *n = list->next; struct _EPopupItem *item = list->data; @@ -929,7 +929,7 @@ eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *disp return FALSE; uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y); - if (uri){ + if (uri) { eab_uri_popup_event(display,event,uri); } -- cgit From 20da1867ea97adc3b1e07b759aafd276e1c6c75a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Jul 2009 11:31:21 +0200 Subject: Bug #589580 - Crashes when dragging an image to the contact editor --- addressbook/gui/widgets/eab-gui-util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 87601d7271..c11ff5351a 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1023,7 +1023,8 @@ eab_create_image_chooser_widget(gchar *name, if (string1) { filename = e_icon_factory_get_icon_filename (string1, GTK_ICON_SIZE_DIALOG); - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); + if (filename && *filename) + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); g_free (filename); } -- cgit