Merge lp:~arthurborsboom/xpad/xpad-4.2 into lp:xpad

[Arthur Borsboom]

Fixed crash after deleting pad(s).
Fixed memory leaks
Updated help
Updated changelog

[Arthur Borsboom (arthurborsboom)]

review: Approve

[lp:~arthurborsboom/xpad/xpad-4.2]

657. By Arthur Borsboom on 2013-10-18

Fixed crash after deleting pad(s).\nFixed memory leaks.\nUpdated help.\nUpdated changelog.

=== modified file 'ChangeLog'
--- ChangeLog	2013-10-09 04:26:23 +0000
+++ ChangeLog	2013-10-18 18:35:35 +0000
@@ -1,16 +1,448 @@
-Changes in v4.2  - Arthur Borsboom <[e-mail]>
-
-- New: Undo functionality such as CTRL-Z (#1121740)
-- New: Tray click behaviour can now be configured (#345278, #304331, #890335)
-- New: Tray icon can be hidden (#890334)
-- New: Theme builders can now use seperate tray icon by adding xpad-panel.xvg (#907705)
-- Fix: Theme color stays after application restart (#307669)
-- Fix: Translation - get many new translations in from translators (thanks guys!!)
-- Fix: Translation - French typo (#1216388)
-- Fix: Translation - Russian typo which prevented the Help from working (#973825)
-- Fix: added missing configure script (#890492)
-- Fix: performance improvement by reducing the amount of harddisk writes (#1072698, #1207564, #782320)
-- Fix: can now compile against glib-2.34.1 (#974011)
+Version 4.1
+* New: Undo functionality such as CTRL-Z (#1121740)
+* New: Tray click behaviour can now be configured (#345278, #304331, #890335)
+* New: Tray icon can be hidden (#890334)
+* New: Theme builders can now use seperate tray icon by adding xpad-panel.xvg (#907705)
+* Fix: Theme color stays after application restart (#307669)
+* Fix: Translation - get many new translations in from translators (thanks guys!!)
+* Fix: Translation - French typo (#1216388)
+* Fix: Translation - Russian typo which prevented the Help from working (#973825)
+* Fix: added missing configure script (#890492)
+* Fix: performance improvement by reducing the amount of harddisk writes (#1072698, #1207564, #782320)
+* Fix: can now compile against glib-2.34.1 (#974011)
+* Fix: no errors or crashes after a delete of a pad (#1237211, #1237563)
+* Fix: different memory leaks (#1237211, #1237563)
+
+Version 4.1
+* Undo/Redo for xpad and bug-fixes. Feature by Sergei Riaguzov
+* Bug #490445: crash when right-clicking on tray icon to display list of notes. Patch by David Hull
+* Bug #360142: Add keyboard shortcuts for formatting. Patch by Dennis Hilmar
+* Bug #591978: xpad critical start. Patch by OBATA Akio
+
+
+Version 4.0
+* Added --toggle (between --hide and --show). Patch by Paul Ivanov.
+* Updated French, Japanese, Russian, Spanish, and Swedish translations
+* New Croatian, Estonian, German, Portuguese, Thai, and Turkish translations
+
+
+Version 3.1
+* Updated Danish, French, Russian, Spanish, and Swedish translations
+* New Czech, Japanese, and Latvian translations
+
+
+Version 3.0
+* Don't wake up every 20 milliseconds to check session management messages.
+  Rather, wait for an event.
+* Add --hide/--show, removed --hide-old.  --hide and --show affect all pads
+  on startup or can be used on an already running xpad instance.  Patch by
+  Jan Losinski.
+* Update icon to be less aliased
+* Relicense as GPL v3+
+
+
+Version 2.14
+* Fix 100% CPU bug
+
+
+Version 2.13
+* Requires GTK+ 2.12
+* Fix pads possibly not remembering location after close
+* Fix pad-closed state not being remembered
+* Uses native status icon code in GTK+ 
+* Maybe, possibly fix some 'pad on all workspaces' problems
+* New Chinese (simplified) translation (Meng Jie)
+* New English (British) translation (David Lodge)
+* New Finnish translation (Jorma Karvonen)
+* New Korean translation (KwangSub Lee)
+* Updated Dutch translation (Benno Schulenberg)
+* Updated Slovak translation (Andrej Kacian)
+* Fixed Danish, Swedish translations
+
+
+Version 2.12
+* Fix a crash when loading pads with formatting
+
+
+Version 2.11
+* If window decorations are turned on, pads will now show up in the taskbar
+* Added -f option to open a file as a note
+* New Chinese (simplified) translation (Meng Jie)
+* New Danish translation (Morten Bo Johansen)
+* New Swedish translation (Daniel Nylander)
+* Updated Chinese (traditional) translation (Wei-Lun Chao)
+
+
+Version 2.10
+* Fix a possible crash when deleting pads with autohide toolbar
+* Make toolbar buttons smaller
+* Make toolbar appear inside pad if there is enough unused space
+* New Slovak translation (Andrej Kacian)
+* New Slovenian translation (Matej Urbančič)
+
+
+Version 2.9
+* Fix pads saving slightly off bad x,y values
+* Fix pads saving bad heights when toolbar always on (Sham Chukoury)
+* Fix possible crash from not allocating enough memory (Federico Schwindt)
+* New Malay translation (Sharuzzaman Ahmat Raslan)
+
+
+Version 2.8
+* Allow translations to be used (broken for a couple versions)
+* New Chinese (traditional) translation (Wei-Lun Chao)
+* Removed half-baked Esperanto translation
+
+
+Version 2.7
+* Stop pads from popping toolbar while the pad is moving/resizing
+* Make sure pads use correct sizes when autohide is off (Sham Chukoury)
+* New Bulgarian translation (Yavor Doganov)
+* New Kinyarwanda translation (Steve Murphy et al)
+
+
+Version 2.6
+* Stop pad windows from 'jumping' when dragged via the toolbar
+* Updated Hungarian translation (Németh Csaba)
+* Updated Irish translation (Kevin Patrick Scannell)
+* Updated Vietnamese translation (Clytie Siddall)
+
+
+Version 2.5
+* Stop making all new pads start in top left
+* Stop closing xpad if toggling window decorations with only one pad open
+* Stop losing pad contents if upgrading from old versions of xpad
+
+
+Version 2.4
+* Create the configuration directory if it doesn't exist
+
+
+Version 2.3
+* Fixed a compile bug with binreloc and threading
+
+
+Version 2.2
+* Bumped GTK+ dependency to 2.6
+* New About dialog (using GtkAboutDialog)
+* New default location for configuration files: ~/.config/xpad
+* Updated icon (now uses lighter colors)
+* Use GOption for command-line parsing
+* New command-line option --hide-old (or -H) to not show old pads
+* Renamed command-line option --nonew to --no-new and added -N shortcut
+* Allow running from console if we don't need to do anything graphical
+* Readded keyboard shortcuts
+* Updated antiquated man page
+* New Hungarian translation (Németh Csaba)
+* New Vietnamese translation (Clytie Siddall)
+* Updated Irish translation (Kevin Patrick Scannell)
+
+
+Version 2.1
+* Fix tray icon being the wrong size
+* Fix xpad to close when no tray and no open pads
+
+
+Version 2.0
+* Fix notes list to display correct number of pads
+* Fix notification icon from not doing anything
+* Fix compilation when BinReloc is disabled
+* Fix compilation with gcc 3.4
+* Fix endianness issue with preference files
+* Updated Dutch translation (Elros Cyriatan)
+
+
+Version 2.0-b3
+* Use BinReloc to allow any-prefix installs of xpad to work
+* Fixed a double-free bug that caused some problems with new pads
+* Updated Irish translation (Kevin Patrick Scannell)
+* Updated Spanish translation (Ramon Rey Vicente)
+
+
+Version 2.0-b2
+* Redesigned preferences and pad properties dialogs
+* If the tray disappears (e.g. killall gnome-panel), xpad's icon reappears
+* More formally ask window manager to make us skip taskbar and pager
+* New, lighter default color for pads
+* Lots of internal code cleanup
+* Fixed a crasher with not being able to find window icons
+* Fixed some crashers with turning off toolbar
+* Fixed bug with text cursor color being one color change behind
+
+
+Version 2.0-b1
+* The text cursor is now always the same color as the text color
+* Formatting can now be applied to selected text
+* Pads remember their hidden state
+* Rewritten toolbar, allowing easier adding/removing/moving buttons
+* Simplified preferences dialog; many functions are now accessed from popup menu
+* --new now also loads the old pads, instead of the previous broken behavior
+* Fixed bug with pads over the 9th not having numbers in note lists
+* Fixed bug with inter process communicating causing only first communication to work
+* Fixed bug with pads becoming unstyled after closing and reopening
+* New Afrikaans translation (Petri Jooste)
+* New French translation (Michel Robitaille)
+
+
+Version 1.13
+* Don't close xpad if no pads are open but the system tray is
+* Made translations work again
+* New Spanish translation (Ramon Rey Vicente)
+* Updated Dutch translation (Elros Cyriatan)
+* Updated Irish translation (Kevin Patrick Scannell)
+
+
+Version 1.12
+* Fixed segfault when clicking on auto-hide toolbar preference
+* Fixed segfault when changing the first toolbar button
+* Added Irish translation (by Kevin Patrick Scannell)
+
+
+Version 1.11
+* Added Dutch translation (by [e-mail])
+* Added partial Esperanto translation (by [e-mail])
+* Added Romanian translation (by [e-mail])
+* Added Russian translation (by [e-mail])
+* Added missing "include <sys/time.h>" (by [e-mail])
+* Added missing #defines for solaris (by [e-mail])
+* Added new icon and install icon family into new location per icon theme spec
+* Fixed disk-full-causes-xpad-contents-to-disappear bug
+* Made pads not show up in taskbar
+* Added 'pads start sticky' option
+
+
+Version 1.10.1
+* Fixed some compile-time issues, particularly with GTK+ 2.0
+
+
+Version 1.10
+* Rewrote applet popup menu to be more consistent and hopefully useful
+* Fixed crash when closing a pad that had provided text in a cut/paste
+* Normalize pad dimensions when opening in case the values got messed up
+* Misc. small bugs
+
+
+Version 1.9.1
+* Fix a segfault when show all is selected after a new pad is made
+
+
+Version 1.9
+* Now use automake/autoconf, which allows for more complete build control
+* Now use gettext, allowing easy translation of xpad
+* Now auto-apply any pad changes to hard drive, making xpad a tad more 
+  reliable
+* Now can easily change settings for only one pad
+* A little more sane title generation -- now just uses first line
+* X session management support
+*
+* Popup menu is decluttered and altered, with the HIG in mind
+* Fixed crash on exit if we didn't init docklet
+* Fixed new pads randomly starting up as white background
+* Cut/copy/paste are now unsensitive if no content to copy or paste
+* Pads now play nice with the X clipboard (middle mouse button)
+* Fixed a bug with the notification area applet
+* Fixed misc. small bugs
+
+
+Version 1.8
+* Allow using system text color, background color, and font
+* Eggtray now appears, allowing users to hide all pads (thanks 
+  [e-mail])
+* Now we compile using autoconf
+*
+* Xpad won't take 100% cpu sometimes when idle
+* Fixed bug that screwed up last toolbar button's toggle setting
+* Fixed toolbar hiding when you right click on another pad
+* Fixed style locking and sticky status changing on menu popup
+* No deletion confirmation if pad is only whitespace
+
+
+Version 1.7
+* Popup alerts are more pleasing.  (HIG compliant)
+* Added --nonew flag to prevent creation of new pads.
+* Changed --new flag to only open a new pad, not try to open old pads too.
+* Changed window titles from quoted to ellipses at the end.
+* Option to turn off toolbar auto-hide.
+* Added --list, -l, --show, -s.
+
+
+Version 1.6.1
+* Fix segfault on startup if toolbar is disabled.
+
+
+Version 1.6
+* Rearrange popup menu
+* More meaningful window titles
+* Add popup menu submenu that allows you to choose window to show
+* Allow reopening of closed pads
+* The return of cut/copy/paste
+* Native sticky support
+* Add a show all command -- via command line or menu
+* Allow turning off of scrollbars
+* Allow reshowing of closed pads (without restarting xpad)
+*
+* Stopped style lock from turning on accidentally
+* Properly handle WM closures
+* Better HIG-style support of keyboard accelerators
+
+
+Version 1.5.1
+* Fix a possible segfault on startup
+
+
+Version 1.5
+* Fixed a bug that stopped saving of defaults on shutdown
+* Better error reporting
+* Added a toolbar with customizable buttons
+* Added some new command line options
+* Allow style locking
+* Allow pad clearing
+* Added all new preference help window
+
+
+Version 1.4
+* Code cleanup
+* We now compile clean with -ansi and -pedantic!  ;)
+* Should take up a little less memory
+* Fixed several memory leaks
+* Should be able to compile on windows and beos.
+	-- PLEASE let me know how this works for you.
+* Added scrollbars if window isn't big enough to handle text
+	-- this fixes two known bugs
+* New xpad processes now handled gracefully
+* Added further optimizations to compilation
+	-- let me know if this causes you problems
+* Fixed some possible buffer overflows
+* Fixed some warnings/errors on gcc3 compilation
+* Cursor icon changes when edit lock is on
+
+
+Version 1.3
+* Added a padding option (thanks Nagy Mate)
+* Redesigned dialogs
+* Preferences now auto-apply
+* You can now choose what the wm close button does, defaults to close
+* Pads have individual titles now
+* Xpad gets along better with various wm's now
+* Cursor no longer blinks if you can't edit pad
+* Fixed double-clicking-doesn't-select-text-when-edit-lock-is-on bug
+* Pads can no longer be individually closed (unless wm decor is on)
+
+
+Version 1.2.1
+* Fixed segfault on startup if no ~/.xpad directory, plus some related bugs
+
+
+Version 1.2
+* Fixed an issue causing black on black with big-endian architectures
+* Added "Edit Lock" mode
+* General code cleanup
+
+
+Version 1.1
+* Simplified popup menu (removed GTK+ default cut/copy/paste/input 
+  method/insert).  If you used them, and miss them, let me know.
+* Added keyboard shortcuts for most menu items
+* Expanded help dialog to include shortcuts
+* Allow border left-drags, right-drags, and right clicks
+
+
+Version 1.0.2
+* Stopped pads from losing their place on x shut down
+
+
+Version 1.0.1
+* Fixed a possible runtime warning with autosaving
+* Made window icon code more robust
+* Added icons for all menu items
+
+
+Version 1.0
+* Added an open file dialog
+* Added a save as dialog
+* Closed pads are handled more consistently
+* Unified color/font change screens
+* Fixed font not being saved correctly
+* Added ability to fine tune default pad settings, including size (before 
+  this was all handled transparently, but size was not always updated)
+* Added optional confirmation to pad destroys
+* Window decorations can now be turned on (in global pref screen)
+* Added border color and border width options
+* Added gui for sync time (autosaving) control
+* Took out --sync-time and -s (you can do same thing with above gui)
+* Stopped new pads always being placed in same spot
+* Added help screen, which opens when you click on "help" from right-click
+  menu and on first run
+* Much cleaner internal api
+* Made xpad more theme-friendly
+* Resizing/moving now works even if numpad is on
+* Xpad 1.0 can now open much older versions of xpad's files (tested to 0.2.1)
+* Added app icon (thanks nestor di)
+
+
+Version 0.2.5
+* Added --help
+* Added short forms of arguments (e.g. -h, -v, -V, -s)
+* Added more output messages
+* Stopped pad raising above popup on right click
+* Fixed bug where old pads wouldn't open upon startup
+* No size limit on pads
+
+
+Version 0.2.4
+* Fixed small memory leak if no default-style file
+* Pads rise to foreground if clicked on now
+* Added "close all" option on popup
+* Prints out a message when autosaving
+* Added --verbosity= option.  (0 is default - no messages; 1 is 
+	moderate - important things like autosaving; 2 is debug -	
+	more info than necessary)
+* Removed some possible buffer overflows if text is too large (a hardcoded 
+  limit of 20k chars now)
+* Misc. code cleanups
+
+
+Version 0.2.3.1
+* Fixed nasty bug where, if you didn't have a working ~/.xpad/default-styles
+  file, it would seg-fault.  my bad
+
+
+Version 0.2.3
+* Perfected (?) syncing.  Now will recover cleanly from anything -- including
+  power shut off or random interrupts.  This fixes the "pad contents
+  disappearing on X-shutdown" bug
+* Moved menu items around a bit
+* Remembers preferred size (only if you change fonts/colors. on TODO)
+* Not always centered now
+
+
+Version 0.2.2
+* Debian-friendly Makefile fixes
+* Cleaned up code
+
+
+Version 0.2.1
+* Changed saving to be more fault-tolerant
+* Added about screen with version info
+
+
+Version 0.2
+* Ported to gtk+-2.0
+* Now can change font color
+* If xpad is already running, will open new pad, not open old pads again
+* In-xpad moving and resizing now works
+* Xpad now recovers better from being interrupted
+* Remembers your preferred style
+* Many small bugfixes
+* Code reorganization
+
+
+Version 0.1.9.2
+* Cleaner lack of decorations
+* Fixed "double-click on menu" bug
+* Fixed segfault when only a font size change was requested
+* Added close and destroy items to menu.  Now you can close a window without
+  losing content
 
 2004-09-29  Jeroen T. Vermeulen <[e-mail]>
 
 
=== removed file 'NEWS'
--- NEWS	2011-11-14 17:10:03 +0000
+++ NEWS	1970-01-01 00:00:00 +0000
@@ -1,430 +0,0 @@
-Version 4.1
-* Undo/Redo for xpad and bug-fixes. Feature by Sergei Riaguzov
-* Bug #490445: crash when right-clicking on tray icon to display list of notes. Patch by David Hull
-* Bug #360142: Add keyboard shortcuts for formatting. Patch by Dennis Hilmar
-* Bug #591978: xpad critical start. Patch by OBATA Akio
-
-
-Version 4.0
-* Added --toggle (between --hide and --show). Patch by Paul Ivanov.
-* Updated French, Japanese, Russian, Spanish, and Swedish translations
-* New Croatian, Estonian, German, Portuguese, Thai, and Turkish translations
-
-
-Version 3.1
-* Updated Danish, French, Russian, Spanish, and Swedish translations
-* New Czech, Japanese, and Latvian translations
-
-
-Version 3.0
-* Don't wake up every 20 milliseconds to check session management messages.
-  Rather, wait for an event.
-* Add --hide/--show, removed --hide-old.  --hide and --show affect all pads
-  on startup or can be used on an already running xpad instance.  Patch by
-  Jan Losinski.
-* Update icon to be less aliased
-* Relicense as GPL v3+
-
-
-Version 2.14
-* Fix 100% CPU bug
-
-
-Version 2.13
-* Requires GTK+ 2.12
-* Fix pads possibly not remembering location after close
-* Fix pad-closed state not being remembered
-* Uses native status icon code in GTK+ 
-* Maybe, possibly fix some 'pad on all workspaces' problems
-* New Chinese (simplified) translation (Meng Jie)
-* New English (British) translation (David Lodge)
-* New Finnish translation (Jorma Karvonen)
-* New Korean translation (KwangSub Lee)
-* Updated Dutch translation (Benno Schulenberg)
-* Updated Slovak translation (Andrej Kacian)
-* Fixed Danish, Swedish translations
-
-
-Version 2.12
-* Fix a crash when loading pads with formatting
-
-
-Version 2.11
-* If window decorations are turned on, pads will now show up in the taskbar
-* Added -f option to open a file as a note
-* New Chinese (simplified) translation (Meng Jie)
-* New Danish translation (Morten Bo Johansen)
-* New Swedish translation (Daniel Nylander)
-* Updated Chinese (traditional) translation (Wei-Lun Chao)
-
-
-Version 2.10
-* Fix a possible crash when deleting pads with autohide toolbar
-* Make toolbar buttons smaller
-* Make toolbar appear inside pad if there is enough unused space
-* New Slovak translation (Andrej Kacian)
-* New Slovenian translation (Matej Urbančič)
-
-
-Version 2.9
-* Fix pads saving slightly off bad x,y values
-* Fix pads saving bad heights when toolbar always on (Sham Chukoury)
-* Fix possible crash from not allocating enough memory (Federico Schwindt)
-* New Malay translation (Sharuzzaman Ahmat Raslan)
-
-
-Version 2.8
-* Allow translations to be used (broken for a couple versions)
-* New Chinese (traditional) translation (Wei-Lun Chao)
-* Removed half-baked Esperanto translation
-
-
-Version 2.7
-* Stop pads from popping toolbar while the pad is moving/resizing
-* Make sure pads use correct sizes when autohide is off (Sham Chukoury)
-* New Bulgarian translation (Yavor Doganov)
-* New Kinyarwanda translation (Steve Murphy et al)
-
-
-Version 2.6
-* Stop pad windows from 'jumping' when dragged via the toolbar
-* Updated Hungarian translation (Németh Csaba)
-* Updated Irish translation (Kevin Patrick Scannell)
-* Updated Vietnamese translation (Clytie Siddall)
-
-
-Version 2.5
-* Stop making all new pads start in top left
-* Stop closing xpad if toggling window decorations with only one pad open
-* Stop losing pad contents if upgrading from old versions of xpad
-
-
-Version 2.4
-* Create the configuration directory if it doesn't exist
-
-
-Version 2.3
-* Fixed a compile bug with binreloc and threading
-
-
-Version 2.2
-* Bumped GTK+ dependency to 2.6
-* New About dialog (using GtkAboutDialog)
-* New default location for configuration files: ~/.config/xpad
-* Updated icon (now uses lighter colors)
-* Use GOption for command-line parsing
-* New command-line option --hide-old (or -H) to not show old pads
-* Renamed command-line option --nonew to --no-new and added -N shortcut
-* Allow running from console if we don't need to do anything graphical
-* Readded keyboard shortcuts
-* Updated antiquated man page
-* New Hungarian translation (Németh Csaba)
-* New Vietnamese translation (Clytie Siddall)
-* Updated Irish translation (Kevin Patrick Scannell)
-
-
-Version 2.1
-* Fix tray icon being the wrong size
-* Fix xpad to close when no tray and no open pads
-
-
-Version 2.0
-* Fix notes list to display correct number of pads
-* Fix notification icon from not doing anything
-* Fix compilation when BinReloc is disabled
-* Fix compilation with gcc 3.4
-* Fix endianness issue with preference files
-* Updated Dutch translation (Elros Cyriatan)
-
-
-Version 2.0-b3
-* Use BinReloc to allow any-prefix installs of xpad to work
-* Fixed a double-free bug that caused some problems with new pads
-* Updated Irish translation (Kevin Patrick Scannell)
-* Updated Spanish translation (Ramon Rey Vicente)
-
-
-Version 2.0-b2
-* Redesigned preferences and pad properties dialogs
-* If the tray disappears (e.g. killall gnome-panel), xpad's icon reappears
-* More formally ask window manager to make us skip taskbar and pager
-* New, lighter default color for pads
-* Lots of internal code cleanup
-* Fixed a crasher with not being able to find window icons
-* Fixed some crashers with turning off toolbar
-* Fixed bug with text cursor color being one color change behind
-
-
-Version 2.0-b1
-* The text cursor is now always the same color as the text color
-* Formatting can now be applied to selected text
-* Pads remember their hidden state
-* Rewritten toolbar, allowing easier adding/removing/moving buttons
-* Simplified preferences dialog; many functions are now accessed from popup menu
-* --new now also loads the old pads, instead of the previous broken behavior
-* Fixed bug with pads over the 9th not having numbers in note lists
-* Fixed bug with inter process communicating causing only first communication to work
-* Fixed bug with pads becoming unstyled after closing and reopening
-* New Afrikaans translation (Petri Jooste)
-* New French translation (Michel Robitaille)
-
-
-Version 1.13
-* Don't close xpad if no pads are open but the system tray is
-* Made translations work again
-* New Spanish translation (Ramon Rey Vicente)
-* Updated Dutch translation (Elros Cyriatan)
-* Updated Irish translation (Kevin Patrick Scannell)
-
-
-Version 1.12
-* Fixed segfault when clicking on auto-hide toolbar preference
-* Fixed segfault when changing the first toolbar button
-* Added Irish translation (by Kevin Patrick Scannell)
-
-
-Version 1.11
-* Added Dutch translation (by [e-mail])
-* Added partial Esperanto translation (by [e-mail])
-* Added Romanian translation (by [e-mail])
-* Added Russian translation (by [e-mail])
-* Added missing "include <sys/time.h>" (by [e-mail])
-* Added missing #defines for solaris (by [e-mail])
-* Added new icon and install icon family into new location per icon theme spec
-* Fixed disk-full-causes-xpad-contents-to-disappear bug
-* Made pads not show up in taskbar
-* Added 'pads start sticky' option
-
-
-Version 1.10.1
-* Fixed some compile-time issues, particularly with GTK+ 2.0
-
-
-Version 1.10
-* Rewrote applet popup menu to be more consistent and hopefully useful
-* Fixed crash when closing a pad that had provided text in a cut/paste
-* Normalize pad dimensions when opening in case the values got messed up
-* Misc. small bugs
-
-
-Version 1.9.1
-* Fix a segfault when show all is selected after a new pad is made
-
-
-Version 1.9
-* Now use automake/autoconf, which allows for more complete build control
-* Now use gettext, allowing easy translation of xpad
-* Now auto-apply any pad changes to hard drive, making xpad a tad more 
-  reliable
-* Now can easily change settings for only one pad
-* A little more sane title generation -- now just uses first line
-* X session management support
-*
-* Popup menu is decluttered and altered, with the HIG in mind
-* Fixed crash on exit if we didn't init docklet
-* Fixed new pads randomly starting up as white background
-* Cut/copy/paste are now unsensitive if no content to copy or paste
-* Pads now play nice with the X clipboard (middle mouse button)
-* Fixed a bug with the notification area applet
-* Fixed misc. small bugs
-
-
-Version 1.8
-* Allow using system text color, background color, and font
-* Eggtray now appears, allowing users to hide all pads (thanks 
-  [e-mail])
-* Now we compile using autoconf
-*
-* Xpad won't take 100% cpu sometimes when idle
-* Fixed bug that screwed up last toolbar button's toggle setting
-* Fixed toolbar hiding when you right click on another pad
-* Fixed style locking and sticky status changing on menu popup
-* No deletion confirmation if pad is only whitespace
-
-
-Version 1.7
-* Popup alerts are more pleasing.  (HIG compliant)
-* Added --nonew flag to prevent creation of new pads.
-* Changed --new flag to only open a new pad, not try to open old pads too.
-* Changed window titles from quoted to ellipses at the end.
-* Option to turn off toolbar auto-hide.
-* Added --list, -l, --show, -s.
-
-
-Version 1.6.1
-* Fix segfault on startup if toolbar is disabled.
-
-
-Version 1.6
-* Rearrange popup menu
-* More meaningful window titles
-* Add popup menu submenu that allows you to choose window to show
-* Allow reopening of closed pads
-* The return of cut/copy/paste
-* Native sticky support
-* Add a show all command -- via command line or menu
-* Allow turning off of scrollbars
-* Allow reshowing of closed pads (without restarting xpad)
-*
-* Stopped style lock from turning on accidentally
-* Properly handle WM closures
-* Better HIG-style support of keyboard accelerators
-
-
-Version 1.5.1
-* Fix a possible segfault on startup
-
-
-Version 1.5
-* Fixed a bug that stopped saving of defaults on shutdown
-* Better error reporting
-* Added a toolbar with customizable buttons
-* Added some new command line options
-* Allow style locking
-* Allow pad clearing
-* Added all new preference help window
-
-
-Version 1.4
-* Code cleanup
-* We now compile clean with -ansi and -pedantic!  ;)
-* Should take up a little less memory
-* Fixed several memory leaks
-* Should be able to compile on windows and beos.
-	-- PLEASE let me know how this works for you.
-* Added scrollbars if window isn't big enough to handle text
-	-- this fixes two known bugs
-* New xpad processes now handled gracefully
-* Added further optimizations to compilation
-	-- let me know if this causes you problems
-* Fixed some possible buffer overflows
-* Fixed some warnings/errors on gcc3 compilation
-* Cursor icon changes when edit lock is on
-
-
-Version 1.3
-* Added a padding option (thanks Nagy Mate)
-* Redesigned dialogs
-* Preferences now auto-apply
-* You can now choose what the wm close button does, defaults to close
-* Pads have individual titles now
-* Xpad gets along better with various wm's now
-* Cursor no longer blinks if you can't edit pad
-* Fixed double-clicking-doesn't-select-text-when-edit-lock-is-on bug
-* Pads can no longer be individually closed (unless wm decor is on)
-
-
-Version 1.2.1
-* Fixed segfault on startup if no ~/.xpad directory, plus some related bugs
-
-
-Version 1.2
-* Fixed an issue causing black on black with big-endian architectures
-* Added "Edit Lock" mode
-* General code cleanup
-
-
-Version 1.1
-* Simplified popup menu (removed GTK+ default cut/copy/paste/input 
-  method/insert).  If you used them, and miss them, let me know.
-* Added keyboard shortcuts for most menu items
-* Expanded help dialog to include shortcuts
-* Allow border left-drags, right-drags, and right clicks
-
-
-Version 1.0.2
-* Stopped pads from losing their place on x shut down
-
-
-Version 1.0.1
-* Fixed a possible runtime warning with autosaving
-* Made window icon code more robust
-* Added icons for all menu items
-
-
-Version 1.0
-* Added an open file dialog
-* Added a save as dialog
-* Closed pads are handled more consistently
-* Unified color/font change screens
-* Fixed font not being saved correctly
-* Added ability to fine tune default pad settings, including size (before 
-  this was all handled transparently, but size was not always updated)
-* Added optional confirmation to pad destroys
-* Window decorations can now be turned on (in global pref screen)
-* Added border color and border width options
-* Added gui for sync time (autosaving) control
-* Took out --sync-time and -s (you can do same thing with above gui)
-* Stopped new pads always being placed in same spot
-* Added help screen, which opens when you click on "help" from right-click
-  menu and on first run
-* Much cleaner internal api
-* Made xpad more theme-friendly
-* Resizing/moving now works even if numpad is on
-* Xpad 1.0 can now open much older versions of xpad's files (tested to 0.2.1)
-* Added app icon (thanks nestor di)
-
-
-Version 0.2.5
-* Added --help
-* Added short forms of arguments (e.g. -h, -v, -V, -s)
-* Added more output messages
-* Stopped pad raising above popup on right click
-* Fixed bug where old pads wouldn't open upon startup
-* No size limit on pads
-
-
-Version 0.2.4
-* Fixed small memory leak if no default-style file
-* Pads rise to foreground if clicked on now
-* Added "close all" option on popup
-* Prints out a message when autosaving
-* Added --verbosity= option.  (0 is default - no messages; 1 is 
-	moderate - important things like autosaving; 2 is debug -	
-	more info than necessary)
-* Removed some possible buffer overflows if text is too large (a hardcoded 
-  limit of 20k chars now)
-* Misc. code cleanups
-
-
-Version 0.2.3.1
-* Fixed nasty bug where, if you didn't have a working ~/.xpad/default-styles
-  file, it would seg-fault.  my bad
-
-
-Version 0.2.3
-* Perfected (?) syncing.  Now will recover cleanly from anything -- including
-  power shut off or random interrupts.  This fixes the "pad contents
-  disappearing on X-shutdown" bug
-* Moved menu items around a bit
-* Remembers preferred size (only if you change fonts/colors. on TODO)
-* Not always centered now
-
-
-Version 0.2.2
-* Debian-friendly Makefile fixes
-* Cleaned up code
-
-
-Version 0.2.1
-* Changed saving to be more fault-tolerant
-* Added about screen with version info
-
-
-Version 0.2
-* Ported to gtk+-2.0
-* Now can change font color
-* If xpad is already running, will open new pad, not open old pads again
-* In-xpad moving and resizing now works
-* Xpad now recovers better from being interrupted
-* Remembers your preferred style
-* Many small bugfixes
-* Code reorganization
-
-
-Version 0.1.9.2
-* Cleaner lack of decorations
-* Fixed "double-click on menu" bug
-* Fixed segfault when only a font size change was requested
-* Added close and destroy items to menu.  Now you can close a window without
-  losing content
 
=== modified file 'src/help.c'
--- src/help.c	2008-09-21 00:03:40 +0000
+++ src/help.c	2013-10-18 18:35:35 +0000
@@ -59,8 +59,8 @@
 _("Most actions are available throught the popup menu "
 "that appears when you right click on a pad.  Try it out and "
 "enjoy."),
-_("Please send comments or bug reports to "
-"[e-mail]"));
+_("Please send ideas or bug reports to\n"
+"https://bugs.launchpad.net/xpad/+filebug"));
 	
 	gtk_label_set_markup (GTK_LABEL (helptext), helptextbuf);
 	
 
=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2013-10-09 14:46:10 +0000
+++ src/xpad-app.c	2013-10-18 18:35:35 +0000
@@ -42,6 +42,7 @@
 #include "xpad-pad-group.h"
 #include "xpad-periodic.h"
 #include "xpad-session-manager.h"
+#include "xpad-settings.h"
 #include "xpad-tray.h"
 
 /* Seems that some systems (sun-sparc-solaris2.8 at least), need the following three #defines. 
@@ -98,8 +99,8 @@
 {
 	gboolean first_time;
 	gboolean have_gtk;
-/*	GdkVisual *visual;*/
-	
+	// GdkVisual *visual;
+
 	/* Set up i18n */
 #ifdef ENABLE_NLS
 	gtk_set_locale ();
@@ -107,7 +108,7 @@
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 #endif
-	
+
 	have_gtk = gtk_init_check (&argc, &argv);
 	xpad_argc = argc;
 	xpad_argv = argv;
@@ -253,7 +254,19 @@
 void
 xpad_app_quit (void)
 {
-	xpad_pad_group_save_unsaved_all(xpad_app_get_pad_group());
+	// Free the memory used by the pads belonging to this group
+	xpad_pad_group_destroy_pads(xpad_app_get_pad_group());
+
+	// Free the memory used by group.
+	g_object_unref(xpad_app_get_pad_group());
+
+	// Free the memory used by the settings menu.
+	g_object_unref(XPAD_SETTINGS(xpad_settings()));
+
+	// Free the memory used by the tray icon and its menu.
+	xpad_tray_close();
+
+	// Give GTK the signal to clean the rest and quit the application.
 	gtk_main_quit();
 }
 
@@ -290,21 +303,24 @@
 {
 	GSList *dirs = NULL, *i;
 	gchar *dirname;
-	
+
 	dirname = g_strdup (path);
+
 	while (!g_file_test (dirname, G_FILE_TEST_EXISTS))
 	{
 		dirs = g_slist_prepend (dirs, dirname);
 		dirname = g_path_get_dirname (dirname);
 	}
 	g_free (dirname);
-	
+
 	for (i = dirs; i; i = i->next)
 	{
 		g_mkdir ((gchar *) i->data, 0700);
 		g_free (i->data);
 	}
-	g_slist_free (dirs);
+
+	g_slist_free(dirs);
+	g_slist_free(i);
 }
 
 /**
@@ -315,9 +331,9 @@
 make_config_dir (void)
 {
 	gchar *dir = NULL;
-	
+
 	make_path (g_get_user_config_dir ());
-	
+
 	dir = g_build_filename (g_get_user_config_dir (), PACKAGE, NULL);
 	
 	if (!g_file_test (dir, G_FILE_TEST_EXISTS))
@@ -391,7 +407,7 @@
 register_stock_icons (void)
 {
 	GtkIconTheme *theme;
-	
+
 	theme = gtk_icon_theme_get_default ();
 	gtk_icon_theme_prepend_search_path (theme, THEME_DIR);
 }
@@ -699,6 +715,7 @@
 	gint size;
 	gint bytesRead;
 	gboolean connected = FALSE;
+	ssize_t error = NULL;
 	
 	/* create master socket */
 	client_fd = socket (PF_LOCAL, SOCK_STREAM, 0);
@@ -713,10 +730,14 @@
 	size = args_to_string (xpad_argc, xpad_argv, &args) + 1;
 	
 	/* first, write length of string */
-	write (client_fd, &size, sizeof (size));
+	error = write (client_fd, &size, sizeof (size));
+	if (error == -1)
+		g_error("There is a problem writing information to the socket.");
 	
 	/* now, write string */
-	write (client_fd, args, size);
+	error = write (client_fd, args, (size_t) size);
+	if (error == -1)
+		g_error("There is a problem writing information to the socket.");
 	
 	do
 	{
 
=== modified file 'src/xpad-grip-tool-item.c'
--- src/xpad-grip-tool-item.c	2008-09-21 00:03:40 +0000
+++ src/xpad-grip-tool-item.c	2013-10-18 18:35:35 +0000
@@ -18,15 +18,16 @@
 
 #include "xpad-grip-tool-item.h"
 
-G_DEFINE_TYPE(XpadGripToolItem, xpad_grip_tool_item, GTK_TYPE_TOOL_ITEM)
-#define XPAD_GRIP_TOOL_ITEM_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_GRIP_TOOL_ITEM, XpadGripToolItemPrivate))
-
 struct XpadGripToolItemPrivate
 {
 	GtkWidget *drawbox;
 };
 
-/*static void xpad_grip_tool_item_size_request (GtkWidget *widget, GtkRequisition *requisition);*/
+G_DEFINE_TYPE_WITH_PRIVATE(XpadGripToolItem, xpad_grip_tool_item, GTK_TYPE_TOOL_ITEM)
+
+static void xpad_grip_tool_item_dispose (GObject *object);
+static void xpad_grip_tool_item_finalize (GObject *object);
+
 static gboolean xpad_grip_tool_item_event_box_expose (GtkWidget *widget, GdkEventExpose *event);
 static void xpad_grip_tool_item_event_box_realize (GtkWidget *widget);
 static gboolean xpad_grip_tool_item_button_pressed_event (GtkWidget *widget, GdkEventButton *event);
@@ -40,15 +41,10 @@
 static void
 xpad_grip_tool_item_class_init (XpadGripToolItemClass *klass)
 {
-	GObjectClass *gobject_class;
-	GtkContainerClass *container_class;
-	GtkWidgetClass *widget_class;
-	
-	gobject_class = (GObjectClass *)klass;
-	container_class = (GtkContainerClass *)klass;
-	widget_class = (GtkWidgetClass *)klass;
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadGripToolItemPrivate));
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	
+	gobject_class->dispose = xpad_grip_tool_item_dispose;
+	gobject_class->finalize = xpad_grip_tool_item_finalize;
 }
 
 static void
@@ -57,7 +53,7 @@
 	GtkWidget *alignment;
 	gboolean right;
 	
-	grip->priv = XPAD_GRIP_TOOL_ITEM_GET_PRIVATE (grip);
+	grip->priv = xpad_grip_tool_item_get_instance_private(grip);
 	
 	grip->priv->drawbox = gtk_drawing_area_new ();
 	gtk_widget_add_events (grip->priv->drawbox, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
@@ -73,6 +69,19 @@
 	gtk_container_add (GTK_CONTAINER (grip), alignment);
 }
 
+static void
+xpad_grip_tool_item_dispose (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_grip_tool_item_parent_class)->dispose (object);
+}
+
+static void
+xpad_grip_tool_item_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_grip_tool_item_parent_class)->finalize (object);
+}
+
+
 static gboolean
 xpad_grip_tool_item_button_pressed_event (GtkWidget *widget, GdkEventButton *event)
 {
 
=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2013-10-09 14:46:10 +0000
+++ src/xpad-pad-group.c	2013-10-18 18:35:35 +0000
@@ -18,20 +18,18 @@
  */
 
 #include "xpad-pad-group.h"
+#include "xpad-settings.h"
 #include "xpad-pad.h"
 
-G_DEFINE_TYPE(XpadPadGroup, xpad_pad_group, G_TYPE_OBJECT)
-
-#define XPAD_PAD_GROUP_GET_PRIVATE(object)  (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_PAD_GROUP, XpadPadGroupPrivate))
-
 struct XpadPadGroupPrivate
 {
 	GSList *pads;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadPadGroup, xpad_pad_group, G_TYPE_OBJECT)
+
 static void     xpad_pad_group_dispose           (GObject *object);
-
-static void     xpad_pad_group_destroy_pads      (XpadPadGroup *group);
+static void     xpad_pad_group_finalize          (GObject *object);
 
 enum {
 	PROP_0
@@ -53,11 +51,20 @@
 }
 
 static void
+xpad_pad_group_init (XpadPadGroup *group)
+{
+	group->priv = xpad_pad_group_get_instance_private(group);
+
+	group->priv->pads = NULL;
+}
+
+static void
 xpad_pad_group_class_init (XpadPadGroupClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	
 	object_class->dispose = xpad_pad_group_dispose;
+	object_class->finalize = xpad_pad_group_finalize;
 	
 	signals[PAD_ADDED] =
 		g_signal_new ("pad_added",
@@ -80,8 +87,6 @@
 		              G_TYPE_NONE,
 		              1,
 		              GTK_TYPE_WIDGET);
-	
-	g_type_class_add_private (object_class, sizeof (XpadPadGroupPrivate));
 }
 
 static void
@@ -89,31 +94,35 @@
 {
 	XpadPadGroup *group = XPAD_PAD_GROUP (object);
 
-	xpad_pad_group_destroy_pads (group);
+	// Save all pads of this group
+	xpad_pad_group_save_unsaved_all(group);
+
+	G_OBJECT_CLASS (xpad_pad_group_parent_class)->dispose (object);
 }
 
 static void
-xpad_pad_group_init (XpadPadGroup *group)
+xpad_pad_group_finalize (GObject *object)
 {
-	group->priv = XPAD_PAD_GROUP_GET_PRIVATE (group);
-	
+	XpadPadGroup *group = XPAD_PAD_GROUP (object);
+
+	g_slist_free (group->priv->pads);
 	group->priv->pads = NULL;
+
+	G_OBJECT_CLASS (xpad_pad_group_parent_class)->finalize (object);
 }
 
-
 GSList *
 xpad_pad_group_get_pads (XpadPadGroup *group)
 {
 	return g_slist_copy (group->priv->pads);
 }
 
-
-/* Subsumes a pad into this group */
+/* Add a pad to this group */
 void
 xpad_pad_group_add (XpadPadGroup *group, GtkWidget *pad)
 {
 	g_object_ref(pad);
-	g_object_ref_sink(GTK_OBJECT(pad));
+	// g_object_ref_sink(GTK_OBJECT(pad));
 	
 	group->priv->pads = g_slist_append (group->priv->pads, XPAD_PAD (pad));
 	g_signal_connect_swapped (pad, "destroy", G_CALLBACK (xpad_pad_group_remove), group);
@@ -121,21 +130,19 @@
 	g_signal_emit (group, signals[PAD_ADDED], 0, pad);
 }
 
-
-/* Removes a pad from this group */
+/* Remove a pad from this group */
 void
 xpad_pad_group_remove (XpadPadGroup *group, GtkWidget *pad)
 {
 	group->priv->pads = g_slist_remove (group->priv->pads, XPAD_PAD (pad));
-	
+	g_object_unref(pad);
+	pad = NULL;
+
 	g_signal_emit (group, signals[PAD_REMOVED], 0, pad);
-	
-	g_object_unref(pad);
 }
 
-
-/* Deletes all the current pads in the group */
-static void
+/* Delete all the current pads in the group */
+void
 xpad_pad_group_destroy_pads (XpadPadGroup *group)
 {
 	g_slist_foreach (group->priv->pads, (GFunc) gtk_widget_destroy, NULL);
@@ -143,6 +150,11 @@
 	group->priv->pads = NULL;
 }
 
+guint
+xpad_pad_group_num_pads (XpadPadGroup *group)
+{
+	return g_slist_length(group->priv->pads);
+}
 
 gint
 xpad_pad_group_num_visible_pads (XpadPadGroup *group)
@@ -156,11 +168,11 @@
 			if (GTK_WIDGET_VISIBLE(GTK_WIDGET(i->data)))
 				num ++;
 		}
+		g_slist_free(i);
 	}
 	return num;
 }
 
-
 void
 xpad_pad_group_close_all (XpadPadGroup *group)
 {
@@ -182,11 +194,9 @@
 		g_slist_foreach (group->priv->pads, (GFunc) gtk_widget_show, NULL);
 }
 
-
 void
 xpad_pad_group_toggle_hide(XpadPadGroup *group)
 {
 	if (group)
 		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_toggle, NULL);
 }
-
 
=== modified file 'src/xpad-pad-group.h'
--- src/xpad-pad-group.h	2013-10-09 14:46:10 +0000
+++ src/xpad-pad-group.h	2013-10-18 18:35:35 +0000
@@ -64,6 +64,7 @@
 GSList * xpad_pad_group_get_pads         (XpadPadGroup *group);
 gint     xpad_pad_group_num_visible_pads (XpadPadGroup *group);
 void     xpad_pad_group_save_unsaved_all (XpadPadGroup *group);
+void     xpad_pad_group_destroy_pads     (XpadPadGroup *group);
 
 G_END_DECLS
 
 
=== modified file 'src/xpad-pad-properties.c'
--- src/xpad-pad-properties.c	2008-09-21 00:03:40 +0000
+++ src/xpad-pad-properties.c	2013-10-18 18:35:35 +0000
@@ -22,9 +22,6 @@
 #include <glib/gi18n.h>
 #include "xpad-pad-properties.h"
 
-G_DEFINE_TYPE(XpadPadProperties, xpad_pad_properties, GTK_TYPE_DIALOG)
-#define XPAD_PAD_PROPERTIES_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_PAD_PROPERTIES, XpadPadPropertiesPrivate))
-
 struct XpadPadPropertiesPrivate 
 {
 	GtkWidget *fontcheck;
@@ -40,6 +37,10 @@
 	GtkWidget *fontbutton;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadPadProperties, xpad_pad_properties, GTK_TYPE_DIALOG)
+
+static void xpad_pad_properties_dispose (GObject *object);
+static void xpad_pad_properties_finalize (GObject *object);
 static void xpad_pad_properties_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void xpad_pad_properties_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xpad_pad_properties_response (GtkDialog *dialog, gint response);
@@ -71,6 +72,8 @@
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	
+	gobject_class->dispose = xpad_pad_properties_dispose;
+	gobject_class->finalize = xpad_pad_properties_finalize;
 	gobject_class->set_property = xpad_pad_properties_set_property;
 	gobject_class->get_property = xpad_pad_properties_get_property;
 	
@@ -115,8 +118,6 @@
 	                                                      "The name of the font for the pad",
 	                                                      NULL,
 	                                                      G_PARAM_READWRITE));
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadPadPropertiesPrivate));
 }
 
 static void
@@ -127,7 +128,7 @@
 	gchar *text;
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	
-	prop->priv = XPAD_PAD_PROPERTIES_GET_PRIVATE (prop);
+	prop->priv = xpad_pad_properties_get_instance_private(prop);
 	
 	text = g_strconcat ("<b>", _("Appearance"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
@@ -233,6 +234,25 @@
 }
 
 static void
+xpad_pad_properties_dispose (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_pad_properties_parent_class)->dispose (object);
+}
+
+static void
+xpad_pad_properties_finalize (GObject *object)
+{
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
+
+	if (&prop->priv->texttmp)
+		gdk_color_free (&prop->priv->texttmp);
+	if (&prop->priv->backtmp != NULL)
+		gdk_color_free (&prop->priv->backtmp);
+
+	G_OBJECT_CLASS (xpad_pad_properties_parent_class)->finalize (object);
+}
+
+static void
 xpad_pad_properties_response (GtkDialog *dialog, gint response)
 {
 	if (response == GTK_RESPONSE_CLOSE)
 
=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2013-10-11 19:45:49 +0000
+++ src/xpad-pad.c	2013-10-18 18:35:35 +0000
@@ -40,13 +40,11 @@
 #include "xpad-toolbar.h"
 #include "xpad-tray.h"
 
-G_DEFINE_TYPE(XpadPad, xpad_pad, GTK_TYPE_WINDOW)
-#define XPAD_PAD_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_PAD, XpadPadPrivate))
-
 struct XpadPadPrivate 
 {
 	/* saved values */
-	gint x, y, width, height;
+	gint x, y;
+	guint width, height;
 	gboolean location_valid;
 	gchar *infoname;
 	gchar *contentname;
@@ -59,7 +57,7 @@
 	/* toolbar stuff */
 	GtkWidget *toolbar;
 	guint toolbar_timeout;
-	gint toolbar_height;
+	guint toolbar_height;
 	gboolean toolbar_expanded;
 	gboolean toolbar_pad_resized;
 	
@@ -72,10 +70,14 @@
 
 	gboolean unsaved_content;
 	gboolean unsaved_info;
+
+	GtkClipboard *clipboard;
 	
 	XpadPadGroup *group;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadPad, xpad_pad, GTK_TYPE_WINDOW)
+
 enum
 {
 	CLOSED,
@@ -221,8 +223,6 @@
 																			 "Pad Group",
 																			 "Pad group for this pad",
 																			 G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadPadPrivate));
 }
 
 /* Class pad - initializer */
@@ -231,9 +231,8 @@
 {
 	GtkWidget *vbox;
 	GtkAccelGroup *accel_group;
-	GtkClipboard *clipboard;
 
-	pad->priv = XPAD_PAD_GET_PRIVATE (pad);
+	pad->priv = xpad_pad_get_instance_private(pad);
 
 	pad->priv->x = 0;
 	pad->priv->y = 0;
@@ -251,8 +250,8 @@
 	pad->priv->toolbar_expanded = FALSE;
 	pad->priv->toolbar_pad_resized = TRUE;
 	pad->priv->properties = NULL;
-	pad->priv->unsaved_content = TRUE;
-	pad->priv->unsaved_info = TRUE;
+	pad->priv->unsaved_content = FALSE;
+	pad->priv->unsaved_info = FALSE;
 	pad->priv->group = NULL;
 
 	XpadTextView *text_view = g_object_new (XPAD_TYPE_TEXT_VIEW,
@@ -277,12 +276,11 @@
 
 	accel_group = gtk_accel_group_new ();
 	gtk_window_add_accel_group (GTK_WINDOW (pad), accel_group);
-	g_object_unref (G_OBJECT (accel_group));
 	pad->priv->menu = menu_get_popup_no_highlight (pad, accel_group);
 	pad->priv->highlight_menu = menu_get_popup_highlight (pad, accel_group);
 	gtk_accel_group_connect (accel_group, GDK_Q, GDK_CONTROL_MASK, 0,
 									 g_cclosure_new_swap (G_CALLBACK (xpad_pad_quit), pad, NULL));
-
+	g_object_unref (G_OBJECT (accel_group));
 
 	vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
 		"homogeneous", FALSE,
@@ -293,7 +291,7 @@
 	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
 
 	gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_settings ()));
-	gtk_window_set_default_size (GTK_WINDOW(pad), xpad_settings_get_width (xpad_settings ()), xpad_settings_get_height (xpad_settings ()));
+	gtk_window_set_default_size (GTK_WINDOW(pad), (gint) xpad_settings_get_width (xpad_settings ()), (gint) xpad_settings_get_height (xpad_settings ()));
 	gtk_window_set_gravity (GTK_WINDOW(pad),  GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
 	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_settings ()));
 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_settings ()));
@@ -309,7 +307,19 @@
 	xpad_pad_notify_clipboard_owner_changed (pad);
 	xpad_pad_notify_undo_redo_changed (pad);
 
- 	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ 	pad->priv->clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+
+	if (pad->priv->sticky)
+		gtk_window_stick (GTK_WINDOW (pad));
+	else
+		gtk_window_unstick (GTK_WINDOW (pad));
+
+	xpad_pad_sync_title (pad);
+
+	gtk_widget_show_all (vbox);
+
+	gtk_widget_hide (pad->priv->toolbar);
+	xpad_pad_notify_has_toolbar (pad);
 
 	/* Set up signals */
 	gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK);
@@ -332,7 +342,7 @@
 	g_signal_connect_swapped (xpad_settings (), "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad);
 	g_signal_connect_swapped (xpad_settings (), "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad);
 	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "notify::has-selection", G_CALLBACK (xpad_pad_notify_has_selection), pad);
-	g_signal_connect_swapped (clipboard, "owner-change", G_CALLBACK (xpad_pad_notify_clipboard_owner_changed), pad);
+	g_signal_connect_swapped (pad->priv->clipboard, "owner-change", G_CALLBACK (xpad_pad_notify_clipboard_owner_changed), pad);
 
 	g_signal_connect_swapped (pad->priv->toolbar, "activate-new", G_CALLBACK (xpad_pad_spawn), pad);
 	g_signal_connect_swapped (pad->priv->toolbar, "activate-clear", G_CALLBACK (xpad_pad_clear), pad);
@@ -352,18 +362,6 @@
 
 	g_signal_connect (pad->priv->menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad);
 	g_signal_connect (pad->priv->highlight_menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad);
-
-	if (pad->priv->sticky)
-		gtk_window_stick (GTK_WINDOW (pad));
-	else
-		gtk_window_unstick (GTK_WINDOW (pad));
-
-	xpad_pad_sync_title (pad);
-
-	gtk_widget_show_all (vbox);
-
-	gtk_widget_hide (pad->priv->toolbar);
-	xpad_pad_notify_has_toolbar (pad);
 }
 
 static void
@@ -389,18 +387,31 @@
 xpad_pad_dispose (GObject *object)
 {
 	XpadPad *pad = XPAD_PAD (object);
-	
-	if (pad->priv->toolbar_timeout)
-	{
-		g_source_remove (pad->priv->toolbar_timeout);
-		pad->priv->toolbar_timeout = 0;
-	}
-	
-	if (pad->priv->properties)
-		gtk_widget_destroy (pad->priv->properties);
-	
-	gtk_widget_destroy (pad->priv->menu);
-	gtk_widget_destroy (pad->priv->highlight_menu);
+
+	if (pad->priv->group) {
+		g_object_unref(pad->priv->group);
+		pad->priv->group = NULL;
+	}
+
+	if (GTK_IS_WIDGET(pad->priv->menu)) {
+		gtk_widget_destroy (pad->priv->menu);
+		pad->priv->menu = NULL;
+	}
+
+	if (GTK_IS_WIDGET(pad->priv->highlight_menu)) {
+		gtk_widget_destroy (pad->priv->highlight_menu);
+		pad->priv->highlight_menu = NULL;
+	}
+
+	if (GTK_IS_CLIPBOARD(pad->priv->clipboard)) {
+		// For some reason the clipboard handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
+		g_signal_handlers_disconnect_matched (pad->priv->clipboard, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+	}
+
+	if (GTK_IS_TOOLBAR(pad->priv->toolbar)) {
+		// For some reason the toolbar handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error.
+		g_signal_handlers_disconnect_matched (pad->priv->toolbar, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+	}
 	
 	G_OBJECT_CLASS (xpad_pad_parent_class)->dispose (object);
 }
@@ -409,12 +420,12 @@
 xpad_pad_finalize (GObject *object)
 {
 	XpadPad *pad = XPAD_PAD (object);
-	
+
+	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+
 	g_free (pad->priv->infoname);
 	g_free (pad->priv->contentname);
 	
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
-	
 	G_OBJECT_CLASS (xpad_pad_parent_class)->finalize (object);
 }
 
@@ -458,11 +469,11 @@
 	/* reshow_with_initial_size() seems to set the window back to a never-shown state.
 		This is good, as some WMs don't like us changing the above parameters mid-run,
 		even if we do a hide/show cycle. */
-	gtk_window_set_default_size (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+	gtk_window_set_default_size (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
 	gtk_window_reshow_with_initial_size (GTK_WINDOW (pad));
 }
 
-static gint
+static guint
 xpad_pad_text_and_toolbar_height (XpadPad *pad)
 {
 	GdkRectangle rec;
@@ -477,7 +488,14 @@
 		&textx, &texty);
 	gtk_widget_translate_coordinates(pad->priv->textview, GTK_WIDGET(pad), textx, texty, &x, &y);
 
-	return y + pad->priv->toolbar_height + gtk_container_get_border_width(GTK_CONTAINER(pad->priv->textview));
+	// Safe cast from gint to guint
+	if (y >= 0) {
+		return (guint) y + pad->priv->toolbar_height + gtk_container_get_border_width(GTK_CONTAINER(pad->priv->textview));
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_toolbar_size_allocate' the variable 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+		return 0;
+	}
 }
 
 static void
@@ -493,7 +511,14 @@
 		if (!pad->priv->toolbar_height)
 		{
 			gtk_widget_size_request (pad->priv->toolbar, &req);
-			pad->priv->toolbar_height = req.height;
+			// safe cast from gint to guint
+			if (req.height >= 0) {
+				pad->priv->toolbar_height = (guint) req.height;
+			}
+			else {
+				g_warning("There is a problem in the program Xpad. In function 'xpad_pad_show_toolbar' the variable 'req.height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+				pad->priv->toolbar_height = 0;
+			}
 		}
 
 		/* Do we have room for the toolbar without covering text? */
@@ -501,7 +526,7 @@
 		{
 			pad->priv->toolbar_expanded = TRUE;
 			pad->priv->height += pad->priv->toolbar_height;
-			gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+			gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
 		}
 		else
 			pad->priv->toolbar_expanded = FALSE;
@@ -526,7 +551,7 @@
 			 (pad->priv->toolbar_pad_resized && xpad_pad_text_and_toolbar_height (pad) >= pad->priv->height))
 		{
 				pad->priv->height -= pad->priv->toolbar_height;
-				gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+				gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
 				pad->priv->toolbar_expanded = FALSE;
 		}
 		if (GTK_WIDGET (pad)->window)
@@ -549,6 +574,9 @@
 static gboolean
 toolbar_timeout (XpadPad *pad)
 {
+	if (pad || !pad->priv || !pad->priv->toolbar_timeout)
+		return FALSE;
+
 	if (pad->priv->toolbar_timeout &&
 		 xpad_settings_get_autohide_toolbar (xpad_settings ()) &&
 		 xpad_settings_get_has_toolbar (xpad_settings ()))
@@ -597,11 +625,17 @@
 	g_return_if_fail (pad);
 
 	XpadToolbar *toolbar = NULL;
-	toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
-	g_return_if_fail (toolbar);
+	// safe cast to toolbar
+	if (XPAD_IS_TOOLBAR(pad->priv->toolbar)) {
+		toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
+		g_return_if_fail (toolbar);
 
-	GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-	xpad_toolbar_enable_paste_button (toolbar, gtk_clipboard_wait_is_text_available (clipboard));
+		GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+		xpad_toolbar_enable_paste_button (toolbar, gtk_clipboard_wait_is_text_available (clipboard));
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_notify_clipboard_owner_changed' the variable 'pad->priv->toolbar' is not of type toolbar. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+	}
 }
 
 void
@@ -722,6 +756,12 @@
 static void
 xpad_pad_delete (XpadPad *pad)
 {
+	g_return_if_fail (pad);
+
+	// With the delayed saving functionality, it is necessary to clear the unsaved flags to prevent usage of non-existing object information.
+	pad->priv->unsaved_info = FALSE;
+	pad->priv->unsaved_content = FALSE;
+
 	if (should_confirm_delete (pad))
 	{
 		GtkWidget *dialog;
@@ -744,11 +784,13 @@
 			return;
 	}
 	
+	// These two if statements actually erase the pad on the harddisk.
 	if (pad->priv->infoname)
 		fio_remove_file (pad->priv->infoname);
 	if (pad->priv->contentname)
 		fio_remove_file (pad->priv->contentname);
 	
+	// Remove the pad from the group and destroy it.
 	gtk_widget_destroy (GTK_WIDGET (pad));
 }
 
@@ -915,7 +957,14 @@
 static gboolean
 xpad_pad_toolbar_size_allocate (XpadPad *pad, GtkAllocation *event)
 {
-	pad->priv->toolbar_height = event->height;
+	// safe cast from gint to guint
+	if (event->height >= 0) {
+		pad->priv->toolbar_height = (guint) event->height;
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_toolbar_size_allocate' the variable 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+		pad->priv->toolbar_height = 0;
+	}
 	return FALSE;
 }
 
@@ -924,17 +973,27 @@
 {
 	if (!GTK_WIDGET_VISIBLE (pad))
 		return FALSE;
+
+	int eWidth = event->width;
+	int eHeight = event->height;
 	
-	if (pad->priv->width != event->width || pad->priv->height != event->height)
-		pad->priv->toolbar_pad_resized = TRUE;
+	// safe cast from gint to guint
+	if (eWidth >= 0 && eHeight >=0 ) {
+		if (pad->priv->width != (guint) eWidth || pad->priv->height != (guint) eHeight)
+			pad->priv->toolbar_pad_resized = TRUE;
+
+		pad->priv->width = (guint) event->width;
+		pad->priv->height = (guint) event->height;
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_configure_event' the variable 'event->width' or 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+	}
 	
 	pad->priv->x = event->x;
 	pad->priv->y = event->y;
-	pad->priv->width = event->width;
-	pad->priv->height = event->height;
 	pad->priv->location_valid = TRUE;
 	
-	xpad_pad_save_content_delayed(pad);
+	xpad_pad_save_info_delayed(pad);
 	
 	/* Sometimes when moving, if the toolbar tries to hide itself,
 		the window manager will not resize it correctly.  So, we make
@@ -974,7 +1033,7 @@
 		case 1:
 			if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
 			{
-				gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time);
+				gtk_window_begin_move_drag (GTK_WINDOW (pad), (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 				return TRUE;
 			}
 			break;
@@ -989,7 +1048,7 @@
 				else
 					edge = GDK_WINDOW_EDGE_SOUTH_WEST;
 				
-				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time);
+				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 			}
 			else
 			{
@@ -1010,7 +1069,7 @@
 		switch (event->button)
 		{
 		case 1:
-			gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time);
+			gtk_window_begin_move_drag (GTK_WINDOW (pad), (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 			return TRUE;
 		
 		case 3:
@@ -1023,7 +1082,7 @@
 				else
 					edge = GDK_WINDOW_EDGE_SOUTH_WEST;
 				
-				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time);
+				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
 			}
 			else
 			{
@@ -1059,6 +1118,8 @@
 xpad_pad_set_group (XpadPad *pad, XpadPadGroup *group)
 {
 	pad->priv->group = group;
+	g_object_ref(pad->priv->group);
+
 	if (group)
 		xpad_pad_group_add (group, GTK_WIDGET (pad));
 }
@@ -1143,6 +1204,9 @@
 	gchar *content;
 	GtkTextBuffer *buffer;
 	
+	if (!pad->priv->unsaved_content)
+		return;
+
 	/* create content file if it doesn't exist yet */
 	if (!pad->priv->contentname)
 	{
@@ -1150,9 +1214,13 @@
 		if (!pad->priv->contentname)
 			return;
 	}
-	
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer));
+
+	if (GTK_IS_TEXT_VIEW(pad->priv->textview)) {
+		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+		content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer));
+	}
+	else
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_save_content' the variable 'pad->priv->textview' is not of type textview. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
 	
 	fio_set_file (pad->priv->contentname, content);
 
@@ -1204,7 +1272,7 @@
 		xpad_pad_show_toolbar (pad); /* these will resize pad at correct height */
 	}
 	else
-		gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height);
+		gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
 	gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y);
 	
 	xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_font);
@@ -1268,14 +1336,21 @@
 	
 	if (show)
 		*show = !hidden;
+
+	g_free(fontname);
 }
 
 void
 xpad_pad_save_info (XpadPad *pad)
 {
-	gint height;
-	GtkStyle *style;
-	gchar *fontname;
+	guint height = NULL;
+	GtkStyle *style = NULL;
+	gchar *fontname = NULL;
+
+	g_return_if_fail (pad);
+
+	if (!pad->priv->unsaved_info)
+		return;
 	
 	/* Must create pad info file if it doesn't exist yet */
 	if (!pad->priv->infoname)
@@ -1327,7 +1402,7 @@
 menu_about (XpadPad *pad)
 {
 	const gchar *artists[] = {"Michael Terry <[e-mail]>", NULL};
-	const gchar *authors[] = {"Arthur Borsboom <[e-mail]", "Jeroen Vermeulen <[e-mail]>", "Michael Terry <[e-mail]>", "Paul Ivanov <[e-mail]>", NULL};
+	const gchar *authors[] = {"Arthur Borsboom <[e-mail]>", "Jeroen Vermeulen <[e-mail]>", "Michael Terry <[e-mail]>", "Paul Ivanov <[e-mail]>", NULL};
 	const gchar *comments = _("Sticky notes");
 	const gchar *copyright = "© 2001-2007 Michael Terry";
 	/* we use g_strdup_printf because C89 has size limits on static strings */
@@ -1460,6 +1535,9 @@
 	gtk_window_present (GTK_WINDOW (pad));
 	
 	g_slist_free (pads);
+	g_slist_free (i);
+	pads = NULL;
+	i = NULL;
 }
 
 static void
@@ -1530,7 +1608,7 @@
 		gtk_window_stick (GTK_WINDOW (pad));
 	else
 		gtk_window_unstick (GTK_WINDOW (pad));
-	xpad_pad_save_info (pad);
+	xpad_pad_save_info_delayed (pad);
 }
 
 static void
@@ -1781,6 +1859,9 @@
 			g_free (key);
 		}
 		g_slist_free (pads);
+		g_slist_free (l);
+		pads = NULL;
+		l = NULL;
 	}
 }
 
@@ -1893,10 +1974,6 @@
 }
 
 /* These functions below are used to reduce the amounts of writes, hence improve the performance. */
-void xpad2_save_content (void * vptr)
-{
-   xpad_pad_save_content(vptr);
-}
 void xpad_pad_save_content_delayed (XpadPad *pad)
 {
    pad->priv->unsaved_content = TRUE;
@@ -1913,6 +1990,6 @@
       xpad_pad_save_content(pad);
    }
    if(pad->priv->unsaved_info == TRUE) {
-      xpad_pad_save_info(pad);
+	   xpad_pad_save_info(pad);
    }
 }
 
=== modified file 'src/xpad-preferences.c'
--- src/xpad-preferences.c	2008-09-21 00:03:40 +0000
+++ src/xpad-preferences.c	2013-10-18 18:35:35 +0000
@@ -25,9 +25,6 @@
 #include "xpad-preferences.h"
 #include "xpad-settings.h"
 
-G_DEFINE_TYPE(XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG)
-#define XPAD_PREFERENCES_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_PREFERENCES, XpadPreferencesPrivate))
-
 struct XpadPreferencesPrivate 
 {
 	GtkWidget *fontcheck;
@@ -60,6 +57,8 @@
 	guint confirmcheck_handler;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG)
+
 static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref);
 static void change_sticky_check (GtkToggleButton *button, XpadPreferences *pref);
 static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
@@ -74,6 +73,7 @@
 static void notify_fontname (XpadPreferences *pref);
 static void notify_text_color (XpadPreferences *pref);
 static void notify_back_color (XpadPreferences *pref);
+static void xpad_preferences_dispose (GObject *object);
 static void xpad_preferences_finalize (GObject *object);
 static void xpad_preferences_response (GtkDialog *dialog, gint response);
 
@@ -98,10 +98,9 @@
 xpad_preferences_class_init (XpadPreferencesClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	
+
+	gobject_class->dispose = xpad_preferences_dispose;
 	gobject_class->finalize = xpad_preferences_finalize;
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadPreferencesPrivate));
 }
 
 static void
@@ -117,7 +116,7 @@
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	GtkRequisition req;
 	
-	pref->priv = XPAD_PREFERENCES_GET_PRIVATE (pref);
+	pref->priv = xpad_preferences_get_instance_private(pref);
 	
 	text = g_strconcat ("<b>", _("Appearance"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
@@ -312,12 +311,16 @@
 }
 
 static void
+xpad_preferences_dispose (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_preferences_parent_class)->dispose (object);
+}
+
+static void
 xpad_preferences_finalize (GObject *object)
 {
 	XpadPreferences *pref = XPAD_PREFERENCES (object);
 	
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
-	
 	G_OBJECT_CLASS (xpad_preferences_parent_class)->finalize (object);
 }
 
 
=== modified file 'src/xpad-settings.c'
--- src/xpad-settings.c	2013-10-07 20:07:46 +0000
+++ src/xpad-settings.c	2013-10-18 18:35:35 +0000
@@ -22,11 +22,6 @@
 #include "xpad-settings.h"
 #include "fio.h"
 
-G_DEFINE_TYPE(XpadSettings, xpad_settings, G_TYPE_OBJECT)
-#define XPAD_SETTINGS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_SETTINGS, XpadSettingsPrivate))
-
-#define DEFAULTS_FILENAME	"default-style"
-
 struct XpadSettingsPrivate 
 {
 	guint width;
@@ -44,6 +39,10 @@
 	GSList *toolbar_buttons;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadSettings, xpad_settings, G_TYPE_OBJECT)
+
+#define DEFAULTS_FILENAME	"default-style"
+
 enum
 {
 	CHANGE_BUTTONS,
@@ -72,6 +71,7 @@
 static void save_to_file (XpadSettings *settings, const gchar *filename);
 static void xpad_settings_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void xpad_settings_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void xpad_settings_dispose (GObject *object);
 static void xpad_settings_finalize (GObject *object);
 
 static XpadSettings *_xpad_settings = NULL;
@@ -91,7 +91,8 @@
 xpad_settings_class_init (XpadSettingsClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	
+
+	gobject_class->dispose = xpad_settings_dispose;
 	gobject_class->finalize = xpad_settings_finalize;
 	gobject_class->set_property = xpad_settings_set_property;
 	gobject_class->get_property = xpad_settings_get_property;
@@ -207,8 +208,6 @@
 		              G_STRUCT_OFFSET (XpadSettingsClass, change_buttons),
 		              NULL, NULL,
 		              g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadSettingsPrivate));
 }
 
 static void
@@ -216,7 +215,7 @@
 {
 	GdkColor back, text;
 	
-	settings->priv = XPAD_SETTINGS_GET_PRIVATE (settings);
+	settings->priv = xpad_settings_get_instance_private(settings);
 	
 	/* A pleasant light yellow color, similar to 
 	   commercial sticky notes. */
@@ -253,13 +252,23 @@
 }
 
 static void
+xpad_settings_dispose (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_settings_parent_class)->dispose (object);
+}
+
+static void
 xpad_settings_finalize (GObject *object)
 {
 	XpadSettings *settings = XPAD_SETTINGS (object);
 	
 	g_slist_free (settings->priv->toolbar_buttons);
-	gdk_color_free (settings->priv->text);
-	gdk_color_free (settings->priv->back);
+
+	if (settings->priv->text)
+		gdk_color_free (settings->priv->text);
+	if (settings->priv->back)
+		gdk_color_free (settings->priv->back);
+
 	g_free (settings->priv->fontname);
 	
 	G_OBJECT_CLASS (xpad_settings_parent_class)->finalize (object);
@@ -427,20 +436,27 @@
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 }
 
+/* Unused function of previous developer
 gboolean xpad_settings_move_toolbar_button (XpadSettings *settings, gint button, gint new)
 {
-	GSList *element;
+	GSList *element = NULL;
 	gpointer data;
 	
-	if (button == new)
+	if (button == new) {
+		g_slist_free(element);
 		return FALSE;
+	}
 	
-	if (new >= g_slist_length (settings->priv->toolbar_buttons) || 0 > new )
+	if (new >= (gint) g_slist_length (settings->priv->toolbar_buttons) || 0 > new ) {
+		g_slist_free(element);
 		return FALSE;
+	}
 	
 	element = g_slist_nth (settings->priv->toolbar_buttons, button);
-	if (!element)
+	if (!element) {
+		g_slist_free(element);
 		return FALSE;
+	}
 	
 	data = element->data;
 	settings->priv->toolbar_buttons = g_slist_delete_link (settings->priv->toolbar_buttons, element);
@@ -450,8 +466,11 @@
 	
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 	
+	g_slist_free(element);
+
 	return TRUE;
 }
+*/
 
 static void xpad_settings_remove_toolbar_list_element (XpadSettings *settings, GSList *element)
 {
@@ -459,14 +478,17 @@
 	settings->priv->toolbar_buttons = g_slist_delete_link (settings->priv->toolbar_buttons, element);
 }
 
+/* Unused function of previous developer
 gboolean xpad_settings_remove_toolbar_button (XpadSettings *settings, gint button)
 {
 	GSList *element;
 	
 	element = g_slist_nth (settings->priv->toolbar_buttons, button);
 	
-	if (!element)
+	if (!element) {
+		g_slist_free(element);
 		return FALSE;
+	}
 	
 	xpad_settings_remove_toolbar_list_element (settings, element);
 	
@@ -474,8 +496,11 @@
 	
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 	
+	g_slist_free(element);
+
 	return TRUE;
 }
+*/
 
 gboolean xpad_settings_remove_all_toolbar_buttons (XpadSettings *settings)
 {
@@ -503,8 +528,10 @@
 	
 	element = g_slist_last (settings->priv->toolbar_buttons);
 	
-	if (!element)
+	if (!element) {
+		g_slist_free(element);
 		return FALSE;
+	}
 	
 	xpad_settings_remove_toolbar_list_element (settings, element);
 	
@@ -512,6 +539,8 @@
 	
 	g_signal_emit (settings, signals[CHANGE_BUTTONS], 0);
 	
+	g_slist_free(element);
+
 	return TRUE;
 }
 
 
=== modified file 'src/xpad-settings.h'
--- src/xpad-settings.h	2011-11-16 20:16:17 +0000
+++ src/xpad-settings.h	2013-10-18 18:35:35 +0000
@@ -82,8 +82,8 @@
 gboolean xpad_settings_get_has_scrollbar (XpadSettings *settings);
 
 void xpad_settings_add_toolbar_button (XpadSettings *settings, const gchar *button);
-gboolean xpad_settings_move_toolbar_button (XpadSettings *settings, gint button, gint new);
-gboolean xpad_settings_remove_toolbar_button (XpadSettings *settings, gint button);
+// gboolean xpad_settings_move_toolbar_button (XpadSettings *settings, gint button, gint new);
+// gboolean xpad_settings_remove_toolbar_button (XpadSettings *settings, gint button);
 gboolean xpad_settings_remove_all_toolbar_buttons (XpadSettings *settings);
 gboolean xpad_settings_remove_last_toolbar_button (XpadSettings *settings);
 G_CONST_RETURN GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings);
 
=== modified file 'src/xpad-text-buffer.c'
--- src/xpad-text-buffer.c	2011-11-16 18:10:04 +0000
+++ src/xpad-text-buffer.c	2013-10-18 18:35:35 +0000
@@ -21,22 +21,20 @@
 #include "xpad-undo.h"
 #include "xpad-pad.h"
 
-G_DEFINE_TYPE(XpadTextBuffer, xpad_text_buffer, GTK_TYPE_TEXT_BUFFER)
-#define XPAD_TEXT_BUFFER_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_TEXT_BUFFER, XpadTextBufferPrivate))
-
 struct XpadTextBufferPrivate 
 {
 	XpadUndo *undo;
 	XpadPad *pad;
+	GtkTextTagTable *tag_table;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadTextBuffer, xpad_text_buffer, GTK_TYPE_TEXT_BUFFER)
+
 /* Unicode chars in the Private Use Area. */
 static gunichar TAG_CHAR = 0xe000;
 
 static GtkTextTagTable *create_tag_table (void);
 
-static GtkTextTagTable *global_text_tag_table = NULL;
-
 enum
 {
 	PROP_0,
@@ -44,81 +42,24 @@
 	LAST_PROP
 };
 
+static void xpad_text_buffer_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void xpad_text_buffer_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void xpad_text_buffer_dispose (GObject *object);
+static void xpad_text_buffer_finalize (GObject *object);
+
 XpadTextBuffer *
-xpad_text_buffer_new (XpadPad *pad)
-{
-	if (!global_text_tag_table)
-		global_text_tag_table = create_tag_table (); /* FIXME: never freed */
-	
-	return XPAD_TEXT_BUFFER (g_object_new (XPAD_TYPE_TEXT_BUFFER, "tag_table", global_text_tag_table, "pad", pad, NULL));
-}
-
-static void
-xpad_text_buffer_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	XpadTextBuffer *text_buffer = XPAD_TEXT_BUFFER (object);
-
-	switch (prop_id)
-	{
-	case PROP_PAD:
-		if (text_buffer->priv->pad && G_IS_OBJECT (text_buffer->priv->pad))
-			g_object_unref (text_buffer->priv->pad);
-		if (G_VALUE_HOLDS_POINTER (value) && G_IS_OBJECT (g_value_get_pointer (value)))
-		{
-			text_buffer->priv->pad = g_value_get_pointer (value);
-			g_object_ref (text_buffer->priv->pad);
-		}
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	 }
-}
-
-static void
-xpad_text_buffer_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	XpadTextBuffer *text_buffer = XPAD_TEXT_BUFFER (object);
-
-	switch (prop_id)
-	{
-	case PROP_PAD:
-		g_value_set_pointer (value, text_buffer->priv->pad);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-
-static void
-xpad_text_buffer_finalize (GObject *object)
-{
-	XpadTextBuffer *text_buffer = XPAD_TEXT_BUFFER (object);
-
-	if (text_buffer->priv->pad)
-	{
-		g_object_unref (text_buffer->priv->pad);
-		text_buffer->priv->pad = NULL;
-	}
-	
-	if (text_buffer->priv->undo)
-	{
-		g_free (text_buffer->priv->undo);
-		text_buffer->priv->undo = NULL;
-	}
-	
-	G_OBJECT_CLASS (xpad_text_buffer_parent_class)->finalize (object);
+xpad_text_buffer_new (void)
+{
+	XpadPad *pad = NULL;
+	return g_object_new (XPAD_TYPE_TEXT_BUFFER, "pad", pad, NULL);
 }
 
 static void
 xpad_text_buffer_class_init (XpadTextBufferClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	
+
+	gobject_class->dispose = xpad_text_buffer_dispose;
 	gobject_class->finalize = xpad_text_buffer_finalize;
 	gobject_class->set_property = xpad_text_buffer_set_property;
 	gobject_class->get_property = xpad_text_buffer_get_property;
@@ -129,18 +70,85 @@
 									"Pad",
 									"Pad connected to this buffer",
 									G_PARAM_READWRITE));
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadTextBufferPrivate));
 }
 
 static void
 xpad_text_buffer_init (XpadTextBuffer *buffer)
 {
-	buffer->priv = XPAD_TEXT_BUFFER_GET_PRIVATE (buffer);
+	buffer->priv = xpad_text_buffer_get_instance_private(buffer);
 
+	buffer->priv->tag_table = create_tag_table ();
 	buffer->priv->undo = xpad_undo_new (buffer);
 }
 
+static void
+xpad_text_buffer_dispose (GObject *object)
+{
+	XpadTextBuffer *buffer = XPAD_TEXT_BUFFER (object);
+
+	if (buffer->priv->pad) {
+		g_object_unref (buffer->priv->pad);
+		buffer->priv->pad = NULL;
+	}
+
+	if (buffer->priv->undo) {
+		g_object_unref (buffer->priv->undo);
+		buffer->priv->undo = NULL;
+	}
+
+	if (buffer->priv->tag_table) {
+		g_object_unref(buffer->priv->tag_table);
+		buffer->priv->tag_table = NULL;
+	}
+	G_OBJECT_CLASS (xpad_text_buffer_parent_class)->dispose (object);
+}
+
+static void
+xpad_text_buffer_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (xpad_text_buffer_parent_class)->finalize (object);
+}
+
+static void
+xpad_text_buffer_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	XpadTextBuffer *buffer = XPAD_TEXT_BUFFER (object);
+
+	switch (prop_id)
+	{
+	case PROP_PAD:
+		if (buffer->priv->pad && G_IS_OBJECT (buffer->priv->pad))
+			g_object_unref (buffer->priv->pad);
+		if (G_VALUE_HOLDS_POINTER (value) && G_IS_OBJECT (g_value_get_pointer (value)))
+		{
+			buffer->priv->pad = g_value_get_pointer (value);
+			g_object_ref (buffer->priv->pad);
+		}
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	 }
+}
+
+static void
+xpad_text_buffer_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	XpadTextBuffer *buffer = XPAD_TEXT_BUFFER (object);
+
+	switch (prop_id)
+	{
+	case PROP_PAD:
+		g_value_set_pointer (value, buffer->priv->pad);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
 void
 xpad_text_buffer_set_text_with_tags (XpadTextBuffer *buffer, const gchar *text)
 {
@@ -432,4 +440,3 @@
 
 	g_object_set (G_OBJECT (buffer), "pad", pad, NULL);
 }
-
 
=== modified file 'src/xpad-text-buffer.h'
--- src/xpad-text-buffer.h	2011-11-16 18:10:04 +0000
+++ src/xpad-text-buffer.h	2013-10-18 18:35:35 +0000
@@ -51,7 +51,7 @@
 
 GType xpad_text_buffer_get_type (void);
 
-XpadTextBuffer *xpad_text_buffer_new (XpadPad *pad);
+XpadTextBuffer *xpad_text_buffer_new (void);
 
 void xpad_text_buffer_set_text_with_tags (XpadTextBuffer *buffer, const gchar *text);
 gchar *xpad_text_buffer_get_text_with_tags (XpadTextBuffer *buffer);
 
=== modified file 'src/xpad-text-view.c'
--- src/xpad-text-view.c	2011-11-16 18:10:04 +0000
+++ src/xpad-text-view.c	2013-10-18 18:35:35 +0000
@@ -20,9 +20,6 @@
 #include "xpad-text-buffer.h"
 #include "xpad-settings.h"
 
-G_DEFINE_TYPE(XpadTextView, xpad_text_view, GTK_TYPE_TEXT_VIEW)
-#define XPAD_TEXT_VIEW_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_TEXT_VIEW, XpadTextViewPrivate))
-
 struct XpadTextViewPrivate 
 {
 	gboolean follow_font_style;
@@ -33,10 +30,13 @@
 	XpadTextBuffer *buffer;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(XpadTextView, xpad_text_view, GTK_TYPE_TEXT_VIEW)
+
 static void xpad_text_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void xpad_text_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void xpad_text_view_dispose (GObject *object);
+static void xpad_text_view_finalize (GObject *object);
 static void xpad_text_view_realize (XpadTextView *widget);
-static void xpad_text_view_finalize (GObject *object);
 static gboolean xpad_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event);
 static gboolean xpad_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event);
 static void xpad_text_view_notify_edit_lock (XpadTextView *view);
@@ -64,7 +64,8 @@
 xpad_text_view_class_init (XpadTextViewClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	
+
+	gobject_class->dispose = xpad_text_view_dispose;
 	gobject_class->finalize = xpad_text_view_finalize;
 	gobject_class->set_property = xpad_text_view_set_property;
 	gobject_class->get_property = xpad_text_view_get_property;
@@ -86,8 +87,6 @@
 	                                                       "Whether to use the default xpad color style",
 	                                                       TRUE,
 	                                                       G_PARAM_READWRITE));
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadTextViewPrivate));
 }
 
 static void
@@ -95,12 +94,12 @@
 {
 	gchar *name;
 	
-	view->priv = XPAD_TEXT_VIEW_GET_PRIVATE (view);
+	view->priv = xpad_text_view_get_instance_private(view);
 	
 	view->priv->follow_font_style = TRUE;
 	view->priv->follow_color_style = TRUE;
 	
-	view->priv->buffer = xpad_text_buffer_new (NULL);
+	view->priv->buffer = xpad_text_buffer_new();
 	gtk_text_view_set_buffer (GTK_TEXT_VIEW (view), GTK_TEXT_BUFFER (view->priv->buffer));
 	
 	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -126,18 +125,20 @@
 }
 
 static void
-xpad_text_view_finalize (GObject *object)
+xpad_text_view_dispose (GObject *object)
 {
 	XpadTextView *view = XPAD_TEXT_VIEW (object);
 
-	if (view->priv->buffer)
-	{
+	if (view->priv->buffer) {
 		g_object_unref (view->priv->buffer);
-		view->priv->buffer = NULL;
 	}
 	
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view);
-	
+	G_OBJECT_CLASS (xpad_text_view_parent_class)->dispose (object);
+}
+
+static void
+xpad_text_view_finalize (GObject *object)
+{
 	G_OBJECT_CLASS (xpad_text_view_parent_class)->finalize (object);
 }
 
 
=== modified file 'src/xpad-toolbar.c'
--- src/xpad-toolbar.c	2011-11-16 20:39:04 +0000
+++ src/xpad-toolbar.c	2013-10-18 18:35:35 +0000
@@ -26,25 +26,24 @@
 #include "xpad-settings.h"
 #include "xpad-grip-tool-item.h"
 
-G_DEFINE_TYPE(XpadToolbar, xpad_toolbar, GTK_TYPE_TOOLBAR)
-#define XPAD_TOOLBAR_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_TOOLBAR, XpadToolbarPrivate))
-
-enum {
-	XPAD_BUTTON_TYPE_SEPARATOR,
-	XPAD_BUTTON_TYPE_BUTTON,
-	XPAD_BUTTON_TYPE_TOGGLE
-};
-
 struct XpadToolbarPrivate
 {
-	GtkToolItem *move_button;
 	gboolean move_removed;
 	guint move_index;
 	guint move_motion_handler;
 	guint move_button_release_handler;
 	guint move_key_press_handler;
-	GtkToolItem *tool_items;
 	XpadPad *pad;
+	// GtkToolItem *move_button;
+	// GtkToolItem *tool_items;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE(XpadToolbar, xpad_toolbar, GTK_TYPE_TOOLBAR)
+
+enum {
+	XPAD_BUTTON_TYPE_SEPARATOR,
+	XPAD_BUTTON_TYPE_BUTTON,
+	XPAD_BUTTON_TYPE_TOGGLE
 };
 
 typedef struct
@@ -94,26 +93,28 @@
 	/*{"Minimize to Tray", "gtk-goto-bottom", 1, N_("Minimize Pads to System Tray")}*/
 };
 
-
 static G_CONST_RETURN XpadToolbarButton *xpad_toolbar_button_lookup (XpadToolbar *toolbar, const gchar *name);
 static GtkToolItem *xpad_toolbar_button_to_item (XpadToolbar *toolbar, const XpadToolbarButton *button);
 static void xpad_toolbar_button_activated (GtkToolButton *button);
 static void xpad_toolbar_change_buttons (XpadToolbar *toolbar);
+static void xpad_toolbar_dispose (GObject *object);
 static void xpad_toolbar_finalize (GObject *object);
 static void xpad_toolbar_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void xpad_toolbar_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xpad_toolbar_remove_all_buttons ();
 static void xpad_toolbar_remove_last_button ();
 static void xpad_toolbar_add_button (const gchar *button_name);
+static gboolean xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button);
+
+/* Unfinished new feature of previous developer
 static void xpad_toolbar_remove_button (GtkWidget *button);
 static gboolean xpad_toolbar_button_press_event (GtkWidget *widget, GdkEventButton *event);
-static gboolean xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button);
 static gboolean xpad_toolbar_popup_button_menu (GtkWidget *button, GdkEventButton *event, XpadToolbar *toolbar);
-
 static gboolean xpad_toolbar_move_button_start (XpadToolbar *toolbar, GtkWidget *button);
 static gboolean xpad_toolbar_move_button_move (XpadToolbar *toolbar, GdkEventMotion *event);
 static gboolean xpad_toolbar_move_button_move_keyboard (XpadToolbar *toolbar, GdkEventKey *event);
 static gboolean xpad_toolbar_move_button_end (XpadToolbar *toolbar);
+*/
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
@@ -139,6 +140,7 @@
 	gtktoolbar_class->popup_context_menu = xpad_toolbar_popup_context_menu;
 	gobject_class->set_property = xpad_toolbar_set_property;
 	gobject_class->get_property = xpad_toolbar_get_property;
+	gobject_class->dispose = xpad_toolbar_dispose;
 	gobject_class->finalize = xpad_toolbar_finalize;
 	
 	/* Signals */
@@ -260,16 +262,13 @@
 									"Pad ",
 									"Pad associated with this toolbar",
 									G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-	
-	g_type_class_add_private (gobject_class, sizeof (XpadToolbarPrivate));
 }
 
 static void
 xpad_toolbar_init (XpadToolbar *toolbar)
 {
-	toolbar->priv = XPAD_TOOLBAR_GET_PRIVATE (toolbar);
+	toolbar->priv = xpad_toolbar_get_instance_private(toolbar);
 
-	toolbar->priv->pad = NULL;	
 	toolbar->priv->move_motion_handler = 0;
 	toolbar->priv->move_button_release_handler = 0;
 	toolbar->priv->move_key_press_handler = 0;
@@ -286,17 +285,21 @@
 }
 
 static void
+xpad_toolbar_dispose (GObject *object)
+{
+	XpadToolbar *toolbar = XPAD_TOOLBAR (object);
+	
+	if (toolbar->priv->pad) {
+		g_object_unref (toolbar->priv->pad);
+		toolbar->priv->pad = NULL;
+	}
+
+	G_OBJECT_CLASS (xpad_toolbar_parent_class)->dispose (object);
+}
+
+static void
 xpad_toolbar_finalize (GObject *object)
 {
-	XpadToolbar *toolbar = XPAD_TOOLBAR (object);
-	
-	if (toolbar->priv->move_button)
-		g_object_unref (toolbar->priv->move_button);
-	if (toolbar->priv->pad)
-		g_object_unref (toolbar->priv->pad);
-	
-	g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, toolbar);
-	
 	G_OBJECT_CLASS (xpad_toolbar_parent_class)->finalize (object);
 }
 
@@ -340,30 +343,10 @@
 	}
 }
 
-static gboolean
-xpad_toolbar_button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-	/* Ignore double-clicks and triple-clicks */
-	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
-	{
-		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
-		xpad_toolbar_popup_button_menu (widget, event, toolbar);
-		return TRUE;
-	}
-	else if (event->button == 2 && event->type == GDK_BUTTON_PRESS)
-	{
-		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
-		xpad_toolbar_move_button_start (toolbar, widget);
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
 static G_CONST_RETURN XpadToolbarButton *
 xpad_toolbar_button_lookup (XpadToolbar *toolbar, const gchar *name)
 {
-	gint i;
+	guint i;
 	for (i = 0; i < G_N_ELEMENTS (buttons); i++)
 		if (!g_ascii_strcasecmp (name, buttons[i].name))
 			return &buttons[i];
@@ -375,7 +358,7 @@
 xpad_toolbar_button_to_item (XpadToolbar *toolbar, const XpadToolbarButton *button)
 {
 	GtkToolItem *item;
-	GtkWidget *child;
+	// GtkWidget *child;
 
 	item = GTK_TOOL_ITEM (g_object_get_data (G_OBJECT (toolbar), button->name));
 	if (item)
@@ -406,17 +389,6 @@
 	if (button->desc)
 		gtk_tool_item_set_tooltip_text (item, _(button->desc));
 
-	// This won't work anymore because we make some buttons insensitive
-	// so we cannot handle right clicks on them anymore. That's why we just add "Remove all butons"
-	// and "Remove last button" to toolbar context menu
-	/*
-	child = gtk_bin_get_child (GTK_BIN (item));
-	if (child)
-	{
-		g_signal_connect_swapped (child, "button-press-event", G_CALLBACK (xpad_toolbar_button_press_event), item);
-	}
-	*/
-
 	return item;
 }
 
@@ -437,7 +409,8 @@
 {
 	GList *list, *temp;
 	const GSList *slist, *stemp;
-	gint i = 0, j;
+	gint i = 0;
+	guint j = 0;
 	GtkToolItem *item;
 	
 	list = gtk_container_get_children (GTK_CONTAINER (toolbar));
@@ -446,6 +419,7 @@
 		gtk_widget_destroy (temp->data);
 	
 	g_list_free (list);
+	g_list_free (temp);
 
 	for (j = 0; j < G_N_ELEMENTS (buttons); j++)
 		g_object_set_data (G_OBJECT (toolbar), buttons[j].name, NULL);
@@ -510,48 +484,247 @@
 }
 
 static void
+menu_deactivated (GtkWidget *menu, GtkToolbar *toolbar)
+{
+	g_signal_emit (toolbar, signals[POPDOWN], 0, menu);
+}
+
+static gboolean
+xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button)
+{
+	GtkWidget *menu;
+	const GSList *current_buttons;
+	guint i;
+	
+	menu = gtk_menu_new ();
+	
+	current_buttons = xpad_settings_get_toolbar_buttons (xpad_settings ());
+
+	gboolean is_button = FALSE;
+	
+	for (i = 0; i < G_N_ELEMENTS (buttons); i++)
+	{
+		const GSList *j;
+		GtkWidget *item, *image;
+		
+		if (strcmp (buttons[i].name, "sep") != 0)
+		{
+			for (j = current_buttons; j; j = j->next)
+				if (!g_ascii_strcasecmp (j->data, buttons[i].name))
+					break;
+			
+			if (j)
+			{
+				is_button = TRUE;
+				continue;
+			}
+		}
+		else
+		{
+			/* Don't let user add separators until we can allow clicks on them. */
+			continue;
+		}
+		
+		item = gtk_image_menu_item_new_with_mnemonic (buttons[i].menu_desc);
+		
+		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+		
+		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_add_button), (gpointer) buttons[i].name);
+		
+		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
+		gtk_widget_show (item);
+	}
+
+	if (is_button)
+	{
+		GtkWidget *item, *image;
+
+		item = gtk_image_menu_item_new_with_mnemonic (N_("Remove All _Buttons"));
+		
+		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+		
+		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_all_buttons), NULL);
+		
+		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
+		gtk_widget_show (item);
+
+		i++;
+		
+		item = gtk_image_menu_item_new_with_mnemonic (N_("Remo_ve Last Button"));
+		
+		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+		
+		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_last_button), NULL);
+		
+		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
+		gtk_widget_show (item);
+	}
+	
+	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
+	
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, (guint) ((button < 0) ? 0 : button), gtk_get_current_event_time ());
+	
+	g_signal_emit (toolbar, signals[POPUP], 0, menu);
+	
+	return TRUE;
+}
+
+static void
+xpad_toolbar_enable_button (XpadToolbar *toolbar, const XpadToolbarButton *button, gboolean enable)
+{
+	g_return_if_fail (button);
+	GtkToolItem *item = xpad_toolbar_button_to_item (toolbar, button);
+	if (item)
+		gtk_widget_set_sensitive (GTK_WIDGET (item), enable);
+}
+
+void
+xpad_toolbar_enable_undo_button (XpadToolbar *toolbar, gboolean enable)
+{
+	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Undo");
+	xpad_toolbar_enable_button (toolbar, button, enable);
+}
+
+void
+xpad_toolbar_enable_redo_button (XpadToolbar *toolbar, gboolean enable)
+{
+	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Redo");
+	xpad_toolbar_enable_button (toolbar, button, enable);
+}
+
+void
+xpad_toolbar_enable_cut_button (XpadToolbar *toolbar, gboolean enable)
+{
+	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Cut");
+	xpad_toolbar_enable_button (toolbar, button, enable);
+}
+
+void
+xpad_toolbar_enable_copy_button (XpadToolbar *toolbar, gboolean enable)
+{
+	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Copy");
+	xpad_toolbar_enable_button (toolbar, button, enable);
+}
+
+void
+xpad_toolbar_enable_paste_button (XpadToolbar *toolbar, gboolean enable)
+{
+	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Paste");
+	xpad_toolbar_enable_button (toolbar, button, enable);
+}
+
+/*
+ * The code below was code in progress of a previous developer
+static gboolean
+xpad_toolbar_button_press_event (GtkWidget *widget, GdkEventButton *event)
+{
+	// Ignore double-clicks and triple-clicks
+	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+	{
+		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
+		xpad_toolbar_popup_button_menu (widget, event, toolbar);
+		return TRUE;
+	}
+	else if (event->button == 2 && event->type == GDK_BUTTON_PRESS)
+	{
+		XpadToolbar *toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (widget), "xpad-toolbar"));
+		xpad_toolbar_move_button_start (toolbar, widget);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean
+xpad_toolbar_popup_button_menu (GtkWidget *button, GdkEventButton *event, XpadToolbar *toolbar)
+{
+	GtkWidget *menu;
+	GtkWidget *item, *image;
+
+	menu = gtk_menu_new ();
+
+
+	item = gtk_image_menu_item_new_with_mnemonic (_("_Remove From Toolbar"));
+
+	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+
+	g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_button), button);
+	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 0, 1);
+	gtk_widget_show (item);
+
+
+	item = gtk_menu_item_new_with_mnemonic (_("_Move"));
+	g_signal_connect_swapped (item, "activate", G_CALLBACK (move_menu_item_activated), button);
+	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 1, 2);
+	gtk_widget_show (item);
+
+
+	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
+
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event ? event->button : 0, gtk_get_current_event_time ());
+
+	g_signal_emit (toolbar, signals[POPUP], 0, menu);
+
+	return TRUE;
+}
+
+static void
 xpad_toolbar_remove_button (GtkWidget *button)
 {
 	gint button_num;
-	
+
 	button_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "xpad-button-num"));
-	
+
 	xpad_settings_remove_toolbar_button (xpad_settings (), button_num);
 }
 
+static void
+move_menu_item_activated (GtkWidget *button)
+{
+	XpadToolbar *toolbar;
+
+	toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (button), "xpad-toolbar"));
+
+	xpad_toolbar_move_button_start (toolbar, button);
+}
+
 static gboolean
 xpad_toolbar_move_button_start (XpadToolbar *toolbar, GtkWidget *button)
 {
 	GdkGrabStatus  status;
 	GdkCursor     *fleur_cursor;
 	GtkWidget *widget;
-	
+
 	widget = GTK_WIDGET (toolbar);
 	gtk_grab_add (widget);
-	
+
 	fleur_cursor = gdk_cursor_new (GDK_FLEUR);
-	
-	g_object_ref (button);
+
+	// g_object_ref (button);
 	toolbar->priv->move_removed = FALSE;
 	toolbar->priv->move_button = GTK_TOOL_ITEM (button);
 	toolbar->priv->move_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "xpad-button-num"));
-	
+
 	toolbar->priv->move_button_release_handler = g_signal_connect (toolbar, "button-release-event", G_CALLBACK (xpad_toolbar_move_button_end), NULL);
 	toolbar->priv->move_key_press_handler = g_signal_connect (toolbar, "key-press-event", G_CALLBACK (xpad_toolbar_move_button_move_keyboard), NULL);
 	toolbar->priv->move_motion_handler = g_signal_connect (toolbar, "motion-notify-event", G_CALLBACK (xpad_toolbar_move_button_move), NULL);
-	
+
 	status = gdk_pointer_grab (widget->window, FALSE,
 				   GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL,
 				   fleur_cursor, gtk_get_current_event_time ());
-	
+
 	gdk_cursor_unref (fleur_cursor);
 	gdk_flush ();
-	
+
 	if (status != GDK_GRAB_SUCCESS)
 	{
 		xpad_toolbar_move_button_end (toolbar);
 	}
-	
+
 	return TRUE;
 }
 
@@ -565,27 +738,27 @@
 			toolbar->priv->move_removed = TRUE;
 			gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
 		}
-		
+
 		if (toolbar->priv->move_index > 0)
 			toolbar->priv->move_index--;
-		
+
 		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 	}
 	else if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right)
 	{
 		gint max;
-		
+
 		if (!toolbar->priv->move_removed)
 		{
 			toolbar->priv->move_removed = TRUE;
 			gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
 		}
-		
+
 		max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
-		
+
 		if (toolbar->priv->move_index < max)
 			toolbar->priv->move_index++;
-		
+
 		gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 	}
 	else if (event->keyval == GDK_space || event->keyval == GDK_KP_Space || event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
@@ -593,7 +766,7 @@
 		xpad_toolbar_move_button_end (toolbar);
 		return TRUE;
 	}
-	
+
 	return TRUE;
 }
 
@@ -601,21 +774,21 @@
 xpad_toolbar_move_button_move (XpadToolbar *toolbar, GdkEventMotion *event)
 {
 	gint max;
-	
+
 	if (!toolbar->priv->move_removed)
 	{
 		toolbar->priv->move_removed = TRUE;
 		gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (toolbar->priv->move_button));
 	}
-	
+
 	toolbar->priv->move_index = gtk_toolbar_get_drop_index (GTK_TOOLBAR (toolbar), event->x, event->y);
-	
-	/* Must not move past separator or grip */
+
+	// Must not move past separator or grip
 	max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
 	toolbar->priv->move_index = MIN (toolbar->priv->move_index, max);
-	
+
 	gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
-	
+
 	return TRUE;
 }
 
@@ -624,210 +797,34 @@
 {
 	gint old_spot;
 	gint max;
-	
+
 	g_signal_handler_disconnect (toolbar, toolbar->priv->move_button_release_handler);
 	g_signal_handler_disconnect (toolbar, toolbar->priv->move_key_press_handler);
 	g_signal_handler_disconnect (toolbar, toolbar->priv->move_motion_handler);
 	toolbar->priv->move_button_release_handler = 0;
 	toolbar->priv->move_key_press_handler = 0;
 	toolbar->priv->move_motion_handler = 0;
-	
+
 	gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar), NULL, 0);
-	
+
 	old_spot = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (toolbar->priv->move_button), "xpad-button-num"));
-	
-	/* Must not move past separator or grip */
+
+	// Must not move past separator or grip
 	max = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar)) - 2;
 	toolbar->priv->move_index = MIN (toolbar->priv->move_index, max);
-	
+
 	if (!xpad_settings_move_toolbar_button (xpad_settings (), old_spot,	toolbar->priv->move_index) &&
 	    toolbar->priv->move_removed)
 	{
 		gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolbar->priv->move_button, toolbar->priv->move_index);
 	}
-	
-	g_object_unref (toolbar->priv->move_button);
+
+	// g_object_unref (toolbar->priv->move_button);
 	toolbar->priv->move_button = NULL;
-	
+
 	gtk_grab_remove (GTK_WIDGET (toolbar));
 	gdk_pointer_ungrab (gtk_get_current_event_time ());
 	return TRUE;
 }
 
-static void
-move_menu_item_activated (GtkWidget *button)
-{
-	XpadToolbar *toolbar;
-	
-	toolbar = XPAD_TOOLBAR (g_object_get_data (G_OBJECT (button), "xpad-toolbar"));
-	
-	xpad_toolbar_move_button_start (toolbar, button);
-}
-
-static void
-menu_deactivated (GtkWidget *menu, GtkToolbar *toolbar)
-{
-	g_signal_emit (toolbar, signals[POPDOWN], 0, menu);
-}
-
-static gboolean
-xpad_toolbar_popup_button_menu (GtkWidget *button, GdkEventButton *event, XpadToolbar *toolbar)
-{
-	GtkWidget *menu;
-	GtkWidget *item, *image;
-	
-	menu = gtk_menu_new ();
-	
-	
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Remove From Toolbar"));
-	
-	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_button), button);
-	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 0, 1);
-	gtk_widget_show (item);
-	
-	
-	item = gtk_menu_item_new_with_mnemonic (_("_Move"));
-	g_signal_connect_swapped (item, "activate", G_CALLBACK (move_menu_item_activated), button);
-	gtk_menu_attach (GTK_MENU (menu), item, 0, 1, 1, 2);
-	gtk_widget_show (item);
-	
-	
-	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
-	
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event ? event->button : 0, gtk_get_current_event_time ());
-	
-	g_signal_emit (toolbar, signals[POPUP], 0, menu);
-	
-	return TRUE;
-}
-
-static gboolean
-xpad_toolbar_popup_context_menu (GtkToolbar *toolbar, gint x, gint y, gint button)
-{
-	GtkWidget *menu;
-	const GSList *current_buttons;
-	gint i;
-	
-	menu = gtk_menu_new ();
-	
-	current_buttons = xpad_settings_get_toolbar_buttons (xpad_settings ());
-
-	gboolean is_button = FALSE;
-	
-	for (i = 0; i < G_N_ELEMENTS (buttons); i++)
-	{
-		const GSList *j;
-		GtkWidget *item, *image;
-		
-		if (strcmp (buttons[i].name, "sep") != 0)
-		{
-			for (j = current_buttons; j; j = j->next)
-				if (!g_ascii_strcasecmp (j->data, buttons[i].name))
-					break;
-			
-			if (j)
-			{
-				is_button = TRUE;
-				continue;
-			}
-		}
-		else
-		{
-			/* Don't let user add separators until we can allow clicks on them. */
-			continue;
-		}
-		
-		item = gtk_image_menu_item_new_with_mnemonic (buttons[i].menu_desc);
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
-		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_add_button), (gpointer) buttons[i].name);
-		
-		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
-		gtk_widget_show (item);
-	}
-
-	if (is_button)
-	{
-		GtkWidget *item, *image;
-
-		item = gtk_image_menu_item_new_with_mnemonic (N_("Remove All _Buttons"));
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
-		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_all_buttons), NULL);
-		
-		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
-		gtk_widget_show (item);
-
-		i++;
-		
-		item = gtk_image_menu_item_new_with_mnemonic (N_("Remo_ve Last Button"));
-		
-		image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		
-		g_signal_connect_swapped (item, "activate", G_CALLBACK (xpad_toolbar_remove_last_button), NULL);
-		
-		gtk_menu_attach (GTK_MENU (menu), item, 0, 1, i, i + 1);
-		gtk_widget_show (item);
-	}
-	
-	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
-	
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, (button < 0) ? 0 : button, gtk_get_current_event_time ());
-	
-	g_signal_emit (toolbar, signals[POPUP], 0, menu);
-	
-	return TRUE;
-}
-
-static void
-xpad_toolbar_enable_button (XpadToolbar *toolbar, const XpadToolbarButton *button, gboolean enable)
-{
-	g_return_if_fail (button);
-	GtkToolItem *item = xpad_toolbar_button_to_item (toolbar, button);
-	if (item)
-		gtk_widget_set_sensitive (GTK_WIDGET (item), enable);
-}
-
-void
-xpad_toolbar_enable_undo_button (XpadToolbar *toolbar, gboolean enable)
-{
-	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Undo");
-	xpad_toolbar_enable_button (toolbar, button, enable);
-}
-
-void
-xpad_toolbar_enable_redo_button (XpadToolbar *toolbar, gboolean enable)
-{
-	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Redo");
-	xpad_toolbar_enable_button (toolbar, button, enable);
-}
-
-void
-xpad_toolbar_enable_cut_button (XpadToolbar *toolbar, gboolean enable)
-{
-	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Cut");
-	xpad_toolbar_enable_button (toolbar, button, enable);
-}
-
-void
-xpad_toolbar_enable_copy_button (XpadToolbar *toolbar, gboolean enable)
-{
-	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Copy");
-	xpad_toolbar_enable_button (toolbar, button, enable);
-}
-
-void
-xpad_toolbar_enable_paste_button (XpadToolbar *toolbar, gboolean enable)
-{
-	const XpadToolbarButton *button = xpad_toolbar_button_lookup (toolbar, "Paste");
-	xpad_toolbar_enable_button (toolbar, button, enable);
-}
-
+*/
 
=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2013-10-09 14:46:10 +0000
+++ src/xpad-tray.c	2013-10-18 18:35:35 +0000
@@ -33,17 +33,19 @@
 static void xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button, guint time);
 
 static GtkStatusIcon  *docklet = NULL;
+static GtkWidget *menu = NULL;
 
 void
 xpad_tray_open (void)
 {
 	GtkIconTheme *theme;
-	
-	xpad_tray_close ();
+
+	// xpad_tray_close ();
 	
 	theme = gtk_icon_theme_get_default ();
-	if (!gtk_icon_theme_has_icon (theme, PACKAGE))
+	if (!gtk_icon_theme_has_icon (theme, PACKAGE)) {
 		return;
+	}
 	
 	if (gtk_icon_theme_has_icon (theme, "xpad-panel"))
     {
@@ -68,6 +70,9 @@
 		g_object_unref (docklet);
 		docklet = NULL;
 	}
+
+	if (menu)
+		gtk_widget_destroy(menu);
 }
 
 gboolean
@@ -111,7 +116,7 @@
 static void
 xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button, guint time)
 {
-	GtkWidget *menu, *item;
+	GtkWidget *item;
 	GSList *pads, *l;
 	gint n;
 	
@@ -126,7 +131,7 @@
 	item = gtk_separator_menu_item_new ();
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);
-	
+
 	item = gtk_menu_item_new_with_mnemonic (_("_Show All"));
 	g_signal_connect_swapped (item, "activate", G_CALLBACK (menu_show_all), xpad_app_get_pad_group ());
 	gtk_container_add (GTK_CONTAINER (menu), item);
@@ -202,4 +207,3 @@
 	g_slist_foreach (pads, (GFunc) gtk_window_present, NULL);
 	g_slist_free (pads);
 }
-
 
=== modified file 'src/xpad-undo.c'
--- src/xpad-undo.c	2013-10-09 04:24:36 +0000
+++ src/xpad-undo.c	2013-10-18 18:35:35 +0000
@@ -26,8 +26,18 @@
 #include "xpad-undo.h"
 #include "xpad-text-buffer.h"
 
-G_DEFINE_TYPE(XpadUndo, xpad_undo, G_TYPE_OBJECT)
-#define XPAD_UNDO_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_UNDO, XpadUndoPrivate))
+struct XpadUndoPrivate
+{
+	XpadTextBuffer *buffer;
+	/* We always redo the next element in the list but undo the current one.
+		We insert this guard with NULL data in the beginning to ease coding all of this */
+	GList *history_start;
+	GList *history_curr;
+	guint user_action;
+	gboolean frozen;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE(XpadUndo, xpad_undo, G_TYPE_OBJECT)
 
 static GObject* xpad_undo_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties);
 static void xpad_undo_dispose (GObject *object);
@@ -62,18 +72,6 @@
 static void xpad_undo_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, XpadUndo *undo);
 static void xpad_undo_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, XpadUndo *undo);
 
-struct XpadUndoPrivate
-{
-	XpadTextBuffer *buffer;
-	XpadPad *pad;
-	/* We always redo the next element in the list but undo the current one.
-		We insert this guard with NULL data in the beginning to ease coding all of this */
-	GList *history_start;
-	GList *history_curr;
-	guint user_action;
-	gboolean frozen;
-};
-
 enum
 {
 	PROP_0,
@@ -92,8 +90,6 @@
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-	/* TODO: neither dispose nor finalize neither in here nor in xpad-pad.c are
-		actually called, have to fix cleaning up */
 	gobject_class->dispose = xpad_undo_dispose;
 	gobject_class->finalize = xpad_undo_finalize;
 	gobject_class->set_property = xpad_undo_set_property;
@@ -106,18 +102,14 @@
 									"Pad Buffer",
 									"Pad buffer connected to this undo",
 									G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (gobject_class, sizeof (XpadUndoPrivate));
 }
 
-
 static void
 xpad_undo_init (XpadUndo *undo)
 {
-	undo->priv = XPAD_UNDO_GET_PRIVATE (undo);
+	undo->priv = xpad_undo_get_instance_private(undo);
 
 	undo->priv->buffer = NULL;
-	undo->priv->buffer = NULL;
 	undo->priv->history_start = g_list_append (NULL, NULL);
 	undo->priv->history_curr = undo->priv->history_start;
 	undo->priv->user_action = 0;
@@ -133,7 +125,7 @@
 	XpadUndo *undo = XPAD_UNDO (obj);
 
 	/* Assert user passed buffer and pad as construct parameter */
-	gint i;
+	guint i;
 	gboolean found_buffer = FALSE;
 	for (i = 0; i < n_properties; i++)
 	{
@@ -148,7 +140,6 @@
 	if (!found_buffer)
 	{
 		undo->priv->buffer = NULL;
-		undo->priv->buffer = NULL;
 		g_warning ("XpadTextBuffer is not passed to XpadUndo constructor, undo will not work!\n");
 	}
 	else
@@ -168,9 +159,7 @@
 {
 	XpadUndo *undo = XPAD_UNDO (object);
 
-	if (undo->priv->buffer && G_IS_OBJECT (undo->priv->buffer))
-	{
-		g_object_unref (undo->priv->buffer);
+	if (undo->priv->buffer) {
 		undo->priv->buffer = NULL;
 	}
 
@@ -186,7 +175,7 @@
 	xpad_undo_clear_history (undo);
 
 	/* remove left guard */
-	g_list_free (undo->priv->history_start);
+	g_list_free(undo->priv->history_start);
 
 	G_OBJECT_CLASS (xpad_undo_parent_class)->finalize (object);
 }
@@ -595,4 +584,3 @@
 {
 	undo->priv->frozen = FALSE;
 }
-