Merge pull request #190 from jb/master

Fix trailing spaces and spelling

.clang_complete

@@ -6,7 +6,7 @@
 -I/usr/include/pango-1.0
 -I/usr/include/pixman-1
 -I/usr/lib/dbus-1.0/include
--I/usr/lib/glib-2.0/include 
+-I/usr/lib/glib-2.0/include
 -I/usr/include/cairo
 -I/usr/include/pixman-1
 -I/usr/include/libdrm

Makefile

@@ -43,7 +43,7 @@ dunst: ${OBJ}
 	@${CC} ${CFLAGS} -o $@ ${OBJ} ${LDFLAGS}
 
 dunstify:
-	@${CC} -o $@ dunstify.c -std=c99 $(shell pkg-config --libs --cflags glib-2.0 libnotify) 
+	@${CC} -o $@ dunstify.c -std=c99 $(shell pkg-config --libs --cflags glib-2.0 libnotify)
 
 debug: ${OBJ}
 	@echo CC -o $@

RELEASE_NOTES.1.0.0

@@ -52,4 +52,4 @@ PACKAGE MAINTAINERS:
     not exist.
 
     Please don't open bug reports when dunstify doesn't work with your
-    version of libnotify 
+    version of libnotify

dunstrc

@@ -1,18 +1,18 @@
 [global]
     font = Monospace 8
-    
+
     # Allow a small subset of html markup:
     #   <b>bold</b>
     #   <i>italic</i>
     #   <s>strikethrough</s>
     #   <u>underline</u>
-    # 
+    #
     # For a complete reference see
     # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
     # If markup is not allowed, those tags will be stripped out of the
     # message.
     allow_markup = yes
-    
+
     # The format of the message.  Possible variables are:
     #   %a  appname
     #   %s  summary
@@ -22,36 +22,36 @@
     #   %p  progress value if set ([  0%] to [100%]) or nothing
     # Markup is allowed
     format = "<b>%s</b>\n%b"
-    
+
     # Sort messages by urgency.
     sort = yes
-    
+
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
-    
+
     # Alignment of message text.
     # Possible values are "left", "center" and "right".
     alignment = left
-    
+
-    # The frequency with wich text that is longer than the notification
+    # The frequency with which text that is longer than the notification
     # window allows bounces back and forth.
     # This option conflicts with "word_wrap".
     # Set to 0 to disable.
     bounce_freq = 0
-    
+
     # Show age of message if message is older than show_age_threshold
     # seconds.
     # Set to -1 to disable.
     show_age_threshold = 60
-    
+
     # Split notifications into multiple lines if they don't fit into
     # geometry.
     word_wrap = yes
-    
+
     # Ignore newlines '\n' in notifications.
     ignore_newline = no
-    
+
-    
+
     # The geometry of the window:
     #   [{width}]x{height}[+/-{x}+/-{y}]
     # The geometry of the message window.
@@ -61,67 +61,67 @@
     # (dmenu-like).  If width is 0, the window expands to the longest
     # message displayed.  A positive x is measured from the left, a
     # negative from the right side of the screen.  Y is measured from
-    # the top and down respectevly.
+    # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
     geometry = "300x5-30+20"
-    
+
     # Shrink window if it's smaller than the width.  Will be ignored if
     # width is 0.
     shrink = no
-    
+
     # The transparency of the window.  Range: [0; 100].
-    # This option will only work if a compositing windowmanager is
+    # This option will only work if a compositing window manager is
     # present (e.g. xcompmgr, compiz, etc.).
     transparency = 0
-    
+
     # Don't remove messages, if the user is idle (no mouse or keyboard input)
     # for longer than idle_threshold seconds.
     # Set to 0 to disable.
     idle_threshold = 120
-    
+
     # Which monitor should the notifications be displayed on.
     monitor = 0
-    
+
     # Display notification on focused monitor.  Possible modes are:
     #   mouse: follow mouse pointer
     #   keyboard: follow window with keyboard focus
     #   none: don't follow anything
-    # 
+    #
-    # "keyboard" needs a windowmanager that exports the
+    # "keyboard" needs a window manager that exports the
     # _NET_ACTIVE_WINDOW property.
-    # This should be the case for almost all modern windowmanagers.
+    # This should be the case for almost all modern window managers.
-    # 
+    #
     # If this option is set to mouse or keyboard, the monitor option
     # will be ignored.
     follow = mouse
-    
+
     # Should a notification popped up from history be sticky or timeout
     # as if it would normally do.
     sticky_history = yes
-    
+
     # Maximum amount of notifications kept in history
     history_length = 20
-    
+
     # Display indicators for URLs (U) and actions (A).
     show_indicators = yes
-    
+
     # The height of a single line.  If the height is smaller than the
     # font height, it will get raised to the font height.
     # This adds empty space above and under the text.
     line_height = 0
-    
+
-    # Draw a line of "separatpr_height" pixel height between two
+    # Draw a line of "separator_height" pixel height between two
     # notifications.
     # Set to 0 to disable.
     separator_height = 2
-    
+
     # Padding between text and separator.
     padding = 8
-    
+
     # Horizontal padding.
     horizontal_padding = 8
-    
+
     # Define a color for the separator.
     # possible values are:
     #  * auto: dunst tries to find a color fitting to the background;
@@ -129,15 +129,15 @@
     #  * frame: use the same color as the frame;
     #  * anything else will be interpreted as a X color.
     separator_color = frame
-    
+
     # Print a notification on startup.
     # This is mainly for error detection, since dbus (re-)starts dunst
     # automatically after a crash.
     startup_notification = false
-    
+
     # dmenu path.
     dmenu = /usr/bin/dmenu -p dunst:
-    
+
     # Browser for opening urls in context menu.
     browser = /usr/bin/firefox -new-tab
 
@@ -157,18 +157,18 @@
     # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
     # "mod3" and "mod4" (windows-key).
     # Xev might be helpful to find names for keys.
-    
+
     # Close notification.
     close = ctrl+space
-    
+
     # Close all notifications.
     close_all = ctrl+shift+space
-    
+
     # Redisplay last message(s).
     # On the US keyboard layout "grave" is normally above TAB and left
     # of "1".
     history = ctrl+grave
-    
+
     # Context menu.
     context = ctrl+shift+period
 
@@ -203,7 +203,7 @@
 # The script will be called as follows:
 #   script appname summary body icon urgency
 # where urgency can be "LOW", "NORMAL" or "CRITICAL".
-# 
+#
 # NOTE: if you don't want a notification to be displayed, set the format
 # to "".
 # NOTE: It might be helpful to run dunst -print in a terminal in order

settings.c

@@ -165,7 +165,7 @@ void load_settings(char *cmdline_config_path)
             option_get_bool("global", "sticky_history", "-sticky_history",
                             sticky_history,
                             "Don't timeout notifications popped up from history");
-        settings.history_length = 
+        settings.history_length =
                 option_get_int("global", "history_length", "-history_length",
                                 history_length,
                                 "Max amount of notifications kept in history");

test/test.sh

@@ -54,7 +54,7 @@ function ignore_newline {
     killall dunst
     ../dunst -config dunstrc.ignore_newline &
     ../dunstify -a "dunst tester" -u c "Ignore Newline" \
-        "The only newlines you should encounter here are wordwraps. That's why I'm so long." 
+        "The only newlines you should encounter here are wordwraps. That's why I'm so long."
     ../dunstify -a "dunst tester" -u c "Th\nis\n\n\n is\n fu\nll of \n" "\nnew\nlines"
     basic_notifications
     keypress
@@ -136,31 +136,31 @@ function geometry {
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x0" &
-    ../dunstify -a "dunst tester" -u c "200x0" 
+    ../dunstify -a "dunst tester" -u c "200x0"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x2" &
-    ../dunstify -a "dunst tester" -u c "200x2" 
+    ../dunstify -a "dunst tester" -u c "200x2"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x1" &
-    ../dunstify -a "dunst tester" -u c "200x1" 
+    ../dunstify -a "dunst tester" -u c "200x1"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "0x1" &
-    ../dunstify -a "dunst tester" -u c "0x1" 
+    ../dunstify -a "dunst tester" -u c "0x1"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "-300x1" &
-    ../dunstify -a "dunst tester" -u c "-300x1" 
+    ../dunstify -a "dunst tester" -u c "-300x1"
     basic_notifications
     keypress