Whitespace cleanup

diff --git a/Makefile b/Makefile
index 2d3f30aa0143a6715577369a1efa911ab1384bab..055db4a38d937e4bc430091b5edd341d68777c76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 VERSION=1.3
 VERSION=1.3

+ARCHIVE=teatimer-$(VERSION).tar.gz

 
 GTK_LIBS:=$(shell pkg-config --libs gtk+-x11-2.0 glib-2.0)
 GTK_CFLAGS:=$(shell pkg-config --cflags gtk+-x11-2.0 glib-2.0)
 
 GTK_LIBS:=$(shell pkg-config --libs gtk+-x11-2.0 glib-2.0)
 GTK_CFLAGS:=$(shell pkg-config --cflags gtk+-x11-2.0 glib-2.0)


@@ -18,5 +19,5 @@ release:
        git push --tags
        git archive --format=tar --prefix=teatimer-$(VERSION)/ HEAD | gzip >$(ARCHIVE)
        scp $(ARCHIVE) atrey:~ftp/pub/local/mj/linux/
        git push --tags
        git archive --format=tar --prefix=teatimer-$(VERSION)/ HEAD | gzip >$(ARCHIVE)
        scp $(ARCHIVE) atrey:~ftp/pub/local/mj/linux/

-       ssh jw "cd www && bin/release-prog teatimer $(VERSION)"
+       ssh jw "cd web && bin/release-prog teatimer $(VERSION)"

        mv $(ARCHIVE) ~/archives/mj/
        mv $(ARCHIVE) ~/archives/mj/

diff --git a/teatimer.c b/teatimer.c
index 1971d0d6d91104e30c1d76b94488d0e50e013829..df94fe2444e8d5428f420e213b9aab86917691df 100644 (file)
--- a/teatimer.c
+++ b/teatimer.c
@@ -29,7 +29,7 @@ static int expired;
 static void
 expand_and_exec(char *cmd)
 {
 static void
 expand_and_exec(char *cmd)
 {

-  GString * expanded_cmd = g_string_new("");
+  GString *expanded_cmd = g_string_new("");

   for (int i=0; cmd[i]; i++)
     {
       if (cmd[i]=='%' && cmd[i+1]=='%')
   for (int i=0; cmd[i]; i++)
     {
       if (cmd[i]=='%' && cmd[i+1]=='%')


@@ -41,7 +41,7 @@ expand_and_exec(char *cmd)
       if (cmd[i]=='%' && cmd[i+1]=='n')
        {
          i++;
       if (cmd[i]=='%' && cmd[i+1]=='n')
        {
          i++;

-         const gchar * name = gtk_entry_get_text(GTK_ENTRY(namebox));
+         const gchar *name = gtk_entry_get_text(GTK_ENTRY(namebox));

          g_string_append(expanded_cmd, name);
        }
       else
          g_string_append(expanded_cmd, name);
        }
       else