Merge branch 'feature/upstream' into develop

1 files changed, 21 insertions, 19 deletions

diff --git a/app/wlib/gtklib/help.c b/app/wlib/gtklib/help.c
index 45d1813..f062b83 100644
--- a/app/wlib/gtklib/help.c
+++ b/app/wlib/gtklib/help.c
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define GTK_DISABLE_SINGLE_INCLUDES
@@ -46,29 +46,31 @@ extern const char * GetCurCommandName();
 static void
 DoHelpMenu(void *data)
 {
-    int func = (intptr_t)data;
+	int func = (intptr_t)data;
 
-    const char * topic;
+	const char * topic;
 
-    switch (func) {
-    case 1:
-        wHelp("contents");
-        break;
+	switch (func) {
+	case 1:
+		wHelp("contents");
+		break;
 
-    case 3:
-    	topic = GetCurCommandName();
-    	if (topic && topic[0])
-    		wHelp(topic);
-    	break;
+	case 3:
+		topic = GetCurCommandName();
+		if (topic && topic[0]) {
+			wHelp(topic);
+		}
+		break;
 
-    default:
-        break;
-    }
+	default:
+		break;
+	}
 
-    return;
+	return;
 }
 
-void wDoAccelHelp(wAccelKey_e key, void * context) {
+void wDoAccelHelp(wAccelKey_e key, void * context)
+{
 	DoHelpMenu(context);
 }
 
@@ -81,6 +83,6 @@ void wDoAccelHelp(wAccelKey_e key, void * context) {
 
 void wMenuAddHelp(wMenu_p m)
 {
-    wMenuPushCreate(m, NULL, _("&Contents"), 0, DoHelpMenu, (void*)1);
-    wMenuPushCreate(m, NULL, _("Co&mmand Context help"), 0, DoHelpMenu, (void*)3);
+	wMenuPushCreate(m, NULL, _("&Contents"), 0, DoHelpMenu, (void*)1);
+	wMenuPushCreate(m, NULL, _("Co&mmand Context help"), 0, DoHelpMenu, (void*)3);
 }