Skip to content

Commit

Permalink
Removed extra spaces from end of lines.
Browse files Browse the repository at this point in the history
  • Loading branch information
spiiroin committed Oct 26, 2012
1 parent 945e56c commit 19ea2dc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion mce-io.c
Expand Up @@ -1299,7 +1299,7 @@ void mce_unregister_io_monitor(gconstpointer io_monitor)

/**
* Set error handling callback for I/O monitor. Error handling callback
* is called from io_error_cb.
* is called from io_error_cb.
*
* @param io_monitor A pointer to the I/O monitor
* @param err_cb A pointer to the error callback. Can be 0 to unset the cb.
Expand Down
4 changes: 2 additions & 2 deletions modules/display.c
Expand Up @@ -2091,7 +2091,7 @@ static gboolean display_on_req_dbus_cb(DBusMessage *const msg)
mce_log(LL_DEBUG,
"Received display on request");

if ((call_state != CALL_STATE_RINGING) &&
if ((call_state != CALL_STATE_RINGING) &&
((submode & (MCE_PROXIMITY_TKLOCK_SUBMODE | MCE_POCKET_SUBMODE)) == 0)) {
(void)execute_datapipe(&display_state_pipe,
GINT_TO_POINTER(MCE_DISPLAY_ON),
Expand Down Expand Up @@ -3068,7 +3068,7 @@ const gchar *g_module_check_init(GModule *module)
DBUS_MESSAGE_TYPE_METHOD_CALL,
display_set_demo_mode_dbus_cb) == NULL)
goto EXIT;


/* Display brightness */
/* Since we've set a default, error handling is unnecessary */
Expand Down
16 changes: 8 additions & 8 deletions tklock.c
Expand Up @@ -223,7 +223,7 @@ typedef enum {
/** Touch screen disabled */
MCE_TS_DISABLED,
/** Touch screen enabled */
MCE_TS_ENABLED
MCE_TS_ENABLED
} ts_state_t;

/** Touch screen state */
Expand Down Expand Up @@ -832,7 +832,7 @@ static void ts_kp_disable_policy(void)
goto EXIT;
}

if ((system_state != MCE_STATE_USER) ||
if ((system_state != MCE_STATE_USER) ||
(is_malf_state_enabled() == TRUE)){
ts_disable();
kp_disable();
Expand Down Expand Up @@ -1482,7 +1482,7 @@ static gboolean disable_tklock(void)
gboolean status = FALSE;

/* Only disable the UI if the active UI is the tklock */
if ((tklock_ui_state == MCE_TKLOCK_UI_NORMAL) ||
if ((tklock_ui_state == MCE_TKLOCK_UI_NORMAL) ||
(tklock_ui_state == MCE_TKLOCK_UI_LPM) ||
(tklock_ui_state == MCE_TKLOCK_UI_SLIDER)) {
if (close_tklock_ui() == FALSE)
Expand Down Expand Up @@ -1825,7 +1825,7 @@ static void trigger_visual_tklock(gboolean powerkey)
display_state_t display_state = datapipe_get_gint(display_state_pipe);
submode_t submode = mce_get_submode_int32();

if ((is_malf_state_enabled() == TRUE) ||
if ((is_malf_state_enabled() == TRUE) ||
(is_tklock_enabled() == FALSE) ||
(is_autorelock_enabled() == FALSE) ||
(system_state != MCE_STATE_USER) ||
Expand Down Expand Up @@ -2140,7 +2140,7 @@ static void process_proximity_state(void)
/* If there's an incoming call or an alarm is visible,
* and the proximity sensor reports open, unblank the display
*/
if ((((call_state == CALL_STATE_RINGING) &&
if ((((call_state == CALL_STATE_RINGING) &&
(inhibit_proximity_relock != MCE_TEMP_INHIBIT_PROXIMITY_RELOCK))||
((alarm_ui_state == MCE_ALARM_UI_VISIBLE_INT32) ||
(alarm_ui_state == MCE_ALARM_UI_RINGING_INT32))) &&
Expand Down Expand Up @@ -2209,8 +2209,8 @@ static void process_proximity_state(void)
((((is_tklock_enabled() == FALSE) &&
(is_autorelock_enabled() == FALSE)) ||
((is_autorelock_enabled() == TRUE) &&
(autorelock_triggers == AUTORELOCK_ON_PROXIMITY))) ||
((saved_tklock_state == MCE_TKLOCK_LOCKED_STATE) ||
(autorelock_triggers == AUTORELOCK_ON_PROXIMITY))) ||
((saved_tklock_state == MCE_TKLOCK_LOCKED_STATE) ||
(saved_tklock_state == MCE_TKLOCK_VISUAL_STATE)))) {

mce_add_submode_int32(MCE_PROXIMITY_TKLOCK_SUBMODE);
Expand Down Expand Up @@ -2538,7 +2538,7 @@ static void display_state_trigger(gconstpointer data)
ts_kp_disable_policy();
} else if ((alarm_ui_state != MCE_ALARM_UI_RINGING_INT32) &&
(is_tklock_enabled() == TRUE)) {
if (is_malf_state_enabled() == FALSE) {
if (is_malf_state_enabled() == FALSE) {
(void)open_tklock_ui(TKLOCK_ENABLE_VISUAL);
}
ts_kp_disable_policy();
Expand Down
2 changes: 1 addition & 1 deletion tools/mcetool.c
Expand Up @@ -2035,7 +2035,7 @@ int main(int argc, char **argv)
newinhibitmode) == FALSE)
goto EXIT;
}

if (demomode != -1) {
if (dbus_send(MCE_SERVICE, MCE_REQUEST_PATH,
MCE_REQUEST_IF, MCE_DBUS_DEMO_MODE_REQ, TRUE,
Expand Down

0 comments on commit 19ea2dc

Please sign in to comment.