Attachment #31646 for bug #49893




		return E_CARD_SIMPLE_FIELD_EMAIL_2;
	case E_CARD_SIMPLE_FIELD_EMAIL_2:
		return E_CARD_SIMPLE_FIELD_EMAIL_3;
	default:
	}

	return E_CARD_SIMPLE_FIELD_LAST;

	switch (*field) {
	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
	default:
	}

	return E_CARD_SIMPLE_FIELD_LAST;

	switch (*field) {
	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
	default:
	}

	return E_CARD_SIMPLE_FIELD_LAST;

		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
	default:
	}

	return E_CARD_SIMPLE_FIELD_LAST;

Lines 213-219 Link Here

(-)evolution-1.4.6.org/calendar/cal-client/cal-client.h (-1 / +1 lines)
213	CalClientResult cal_client_remove_object (CalClient client, const char uid);	213	CalClientResult cal_client_remove_object (CalClient client, const char uid);
214	CalClientResult cal_client_remove_object_with_mod (CalClient client, const char uid, CalObjModType mod);	214	CalClientResult cal_client_remove_object_with_mod (CalClient client, const char uid, CalObjModType mod);
215		215
216	CalClientSendResult cal_client_send_object (CalClient client, icalcomponent icalcomp,	216	CalClientResult cal_client_send_object (CalClient client, icalcomponent icalcomp,
217	icalcomponent new_icalcomp, GList users,	217	icalcomponent new_icalcomp, GList users,
218	char error_msg[256]);	218	char error_msg[256]);
219		219

Lines 52-58 Link Here

(-)evolution-1.4.6.org/e-util/e-component-listener.c (-1 lines)
52	cl->priv->component = CORBA_OBJECT_NIL;	52	cl->priv->component = CORBA_OBJECT_NIL;
53	g_object_unref (cl);	53	g_object_unref (cl);
54	break;	54	break;
55	default :
56	}	55	}
57	}	56	}
58	}	57	}

Lines 344-350 Link Here

(-)evolution-1.4.6.org/mail/message-browser.c (-1 lines)
344	case GDK_Escape:	344	case GDK_Escape:
345	message_browser_close (NULL, mb, NULL);	345	message_browser_close (NULL, mb, NULL);
346	return TRUE;	346	return TRUE;
347	default:
348	}	347	}
349		348
350	return FALSE;	349	return FALSE;

Lines 3235-3241 Link Here

(-)evolution-1.4.6.org/calendar/gui/e-day-view.c (-2 lines)
3235	case GDK_SCROLL_DOWN:	3235	case GDK_SCROLL_DOWN:
3236	e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);	3236	e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
3237	return TRUE;	3237	return TRUE;
3238	default:
3239	}	3238	}
3240		3239
3241	return FALSE;	3240	return FALSE;
Lines 3255-3261 Link Here
3255	case GDK_SCROLL_DOWN:	3254	case GDK_SCROLL_DOWN:
3256	e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);	3255	e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
3257	return TRUE;	3256	return TRUE;
3258	default:
3259	}	3257	}
3260		3258
3261	return FALSE;	3259	return FALSE;

Return to bug 49893

Lines 609-615 Link Here

(-)evolution-1.4.6.org/addressbook/conduit/address-conduit.c (-4 lines)
609	return E_CARD_SIMPLE_FIELD_EMAIL_2;	609	return E_CARD_SIMPLE_FIELD_EMAIL_2;
610	case E_CARD_SIMPLE_FIELD_EMAIL_2:	610	case E_CARD_SIMPLE_FIELD_EMAIL_2:
611	return E_CARD_SIMPLE_FIELD_EMAIL_3;	611	return E_CARD_SIMPLE_FIELD_EMAIL_3;
612	default:
613	}	612	}
614		613
615	return E_CARD_SIMPLE_FIELD_LAST;	614	return E_CARD_SIMPLE_FIELD_LAST;
Lines 624-630 Link Here
624	switch (*field) {	623	switch (*field) {
625	case E_CARD_SIMPLE_FIELD_PHONE_HOME:	624	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
626	return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;	625	return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
627	default:
628	}	626	}
629		627
630	return E_CARD_SIMPLE_FIELD_LAST;	628	return E_CARD_SIMPLE_FIELD_LAST;
Lines 639-645 Link Here
639	switch (*field) {	637	switch (*field) {
640	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:	638	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
641	return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;	639	return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
642	default:
643	}	640	}
644		641
645	return E_CARD_SIMPLE_FIELD_LAST;	642	return E_CARD_SIMPLE_FIELD_LAST;
Lines 656-662 Link Here
656	return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;	653	return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
657	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:	654	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
658	return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;	655	return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
659	default:
660	}	656	}
661		657
662	return E_CARD_SIMPLE_FIELD_LAST;	658	return E_CARD_SIMPLE_FIELD_LAST;