Merge lp:~gilir/xpad/xpad-panel-icon into lp:xpad

[Julien Lavergne]

Implementation for bug 907705 (adding an xpad-panel icon if it's in the icon theme)

[Arthur Borsboom (arthurborsboom)]

https://code.launchpad.net/~gilir/xpad/xpad-panel-icon/+merge/119710

* Reason is feature request: https://bugs.launchpad.net/xpad/+bug/907705
* Proposed branch: lp:~gilir/xpad/xpad-panel-icon

Expected result(s)
If a file called xpad-panel.svg is added to the current Icon Theme,
this icon should be shown in the systray. The regular icon of the
application, should not change. Other behaviour of the application
should not change.

Specific tests regarding the change: works
Regression tests:
- Create new note: works
- Delete note: works
- Save note: works
- Tray shows: works
- Tray hides: works
- Quit application: works
- Show all: works
- Close all: works
- Select specific note from tray: works
- Preferences, font change: works
- Preferences, save font change: works

Code quality: fine.
Review: ok

Ready to be merged.

With kind regards,
Arthur Borsboom
------------------------

[Arthur Borsboom (arthurborsboom)]

https://code.launchpad.net/~gilir/xpad/xpad-panel-icon/+merge/119710

* Reason is feature request: https://bugs.launchpad.net/xpad/+bug/907705
* Proposed branch: lp:~gilir/xpad/xpad-panel-icon

Expected result(s)
If a file called xpad-panel.svg is added to the current Icon Theme,
this icon should be shown in the systray. The regular icon of the
application, should not change. Other behaviour of the application
should not change.

Specific tests regarding the change: works
Regression tests:
- Create new note: works
- Delete note: works
- Save note: works
- Tray shows: works
- Tray hides: works
- Quit application: works
- Show all: works
- Close all: works
- Select specific note from tray: works
- Preferences, font change: works
- Preferences, save font change: works

Code quality: fine.
Review: ok

Ready to be merged.

With kind regards,
Arthur Borsboom

review: Approve

=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2008-09-21 00:03:40 +0000
+++ src/xpad-tray.c	2012-08-15 13:38:22 +0000
@@ -45,7 +45,14 @@
 	if (!gtk_icon_theme_has_icon (theme, PACKAGE))
 		return;
 	
-	docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
+	if (gtk_icon_theme_has_icon (theme, "xpad-panel"))
+    {
+	    docklet = gtk_status_icon_new_from_icon_name ("xpad-panel");
+    }
+    else
+    {
+	    docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
+    }
 	
 	if (docklet)
 	{