Diff of /src/key_events.c [aeb8a9] .. [6b8ec8] Maximize Restore

  Switch to side-by-side view

--- a/src/key_events.c
+++ b/src/key_events.c
@@ -192,7 +192,7 @@
   get_menu_bar_accel (w, &keyval, &mods);
   return event->keyval == keyval &&
 	 (event->state & GXINE_MODIFIER_MASK) == (mods & GXINE_MODIFIER_MASK);
-}  
+}
 
 gboolean keypress_cb (GtkWidget *win, GdkEventKey *event, gpointer data)
 {
@@ -209,8 +209,8 @@
 	  (key_binding->keyval == keyval ||
 	   key_binding->keyval == ~event->hardware_keycode))
       {
-        char *binding = kb2str (key_binding);
-        asreprintf (&binding, _("key binding %s"), binding);
+	char *binding = kb2str (key_binding);
+	asreprintf (&binding, _("key binding %s"), binding);
 	/* defer execution of commands due to keypresses during startup */
 	engine_queue_push (key_binding->cmd, NULL, NULL, NULL, NULL, binding);
 	free (binding);
@@ -431,7 +431,7 @@
     int i = -1;
     while (default_bindings[++i].desc)
       if (!strcasecmp (default_bindings[i].cmd, new_binding->cmd))
-        break;
+	break;
     key_binding->desc  = strdup (default_bindings[i].desc ? : new_binding->cmd);
   }
   else
@@ -705,9 +705,9 @@
 	    break;
 	  }
 
-        if (version < 2)
-        {
-          display_info (FROM_GXINE, _("Upgrading your key bindings"),
+	if (version < 2)
+	{
+	  display_info (FROM_GXINE, _("Upgrading your key bindings"),
 			_("Your key bindings are being upgraded. This adds:\n"
 			" ��� Key binding descriptions\n"
 			" ��� VDR support\n"
@@ -715,10 +715,10 @@
 			"Some old deleted bindings may have been restored.\n"
 			"You should check your bindings now.\n")
 			);
-          load_default_kb ();
-        }
-        else if (version < 3)
-          display_info (FROM_GXINE, _("Upgrading your key bindings"), "");
+	  load_default_kb ();
+	}
+	else if (version < 3)
+	  display_info (FROM_GXINE, _("Upgrading your key bindings"), "");
 
 	xml_node_t *node;
 	foreach_glist (node, root->child)
@@ -946,7 +946,7 @@
     return TRUE;
   if (event->keyval == GDK_Menu && !(event->state & GXINE_MODIFIER_MASK))
     return TRUE;
-  
+
   if (is_menu_accel (widget, event))
     return TRUE;
 
@@ -1289,7 +1289,7 @@
 	++prefix;
       }
       if (!*prefix) /* no match found */
-        return JS_TRUE;
+	return JS_TRUE;
     }
   }
 
@@ -1423,7 +1423,7 @@
       { "binding", NULL,			N_("_Reload...") },
       { "reload",  GTK_STOCK_REVERT_TO_SAVED,	N_("_Reload bindings"),			NULL,		NULL,				kb_reload_keymap },
       { "addnew",  GTK_STOCK_ADD,		N_("_Add new default bindings"),	NULL,		NULL,				kb_add_defaults },
-      { "merge",   NULL,			N_("_Merge default bindings"),	   	NULL,		NULL,				kb_merge_defaults },
+      { "merge",   NULL,			N_("_Merge default bindings"),		NULL,		NULL,				kb_merge_defaults },
       { "replace", GTK_STOCK_CLEAR,		N_("Replace with _default bindings"),	NULL,		NULL,				kb_reset_keymap },
       { "new",	   GTK_STOCK_NEW,		NULL,					NULL,		N_("Add a key binding"),	kb_new_binding },
       { "edit",	   GTK_STOCK_EDIT,		NULL,					"<Control>E",	N_("Edit the selected item"),	kb_edit_binding },