Index: configure.in
===================================================================
--- configure.in	(revision 11169)
+++ configure.in	(working copy)
@@ -790,6 +790,7 @@
 invest-applet/data/art/Makefile
 gweather/Makefile
 gweather/docs/Makefile
+gweather/icons/Makefile
 geyes/Makefile
 geyes/themes/Makefile
 geyes/docs/Makefile
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 11169)
+++ ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2008-12-21  Frank Solensky  <frank@solensky.org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* configure.in: add gweather/icons subdirectory
+
 ==================== 2.25.2 ======================
 
 2008-12-20  Callum McKenzie  <callum@spooky-possum.org>
Index: gweather/gweather-applet.h
===================================================================
--- gweather/gweather-applet.h	(revision 11169)
+++ gweather/gweather-applet.h	(working copy)
@@ -23,6 +23,7 @@
 extern gint timeout_cb (gpointer data);
 extern gint suncalc_timeout_cb (gpointer data);
 extern void gweather_update (GWeatherApplet *applet);
+extern const char* gweather_info_get_icon_name (WeatherInfo *info);
 
 G_END_DECLS
 
Index: gweather/gweather-dialog.c
===================================================================
--- gweather/gweather-dialog.c	(revision 11169)
+++ gweather/gweather-dialog.c	(working copy)
@@ -599,7 +599,7 @@
     	return;
 
     /* Update icon */
-    icon_name = weather_info_get_icon_name (gw_applet->gweather_info);
+    icon_name = gweather_info_get_icon_name (gw_applet->gweather_info);
     gtk_image_set_from_icon_name (GTK_IMAGE (priv->cond_image), 
                                   icon_name, GTK_ICON_SIZE_DIALOG);
 
Index: gweather/ChangeLog
===================================================================
--- gweather/ChangeLog	(revision 11169)
+++ gweather/ChangeLog	(working copy)
@@ -1,3 +1,15 @@
+2008-12-21  Frank Solensky  <frank@solensky.org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* gweather-applet.c (gweather_info_get_icon_name), (place_widgets),
+	(update_finish), (gweather_update):  add gweather_info_get_icon_name
+	to retrive application's phase-of-moon icons (Bug #170227)
+	* gweather-applet.h: declaration of same
+	* gweather-dialog.c (gweather_dialog_update): call to same
+	* main.c (gweather_applet_new): adjust icon theme path
+	* Makefile.am: add gweather/icons, "-D" for icon search path
+
 ==================== 2.25.2 ======================
 
 2008-12-17  William Jon McCann  <jmccann@redhat.com>
Index: gweather/main.c
===================================================================
--- gweather/main.c	(revision 11169)
+++ gweather/main.c	(working copy)
@@ -33,8 +33,11 @@
 
 	char *prefs_key = panel_applet_get_preferences_key(applet);
 
+	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+					  APPNAME_DATA_DIR G_DIR_SEPARATOR_S "icons");
+
 	panel_applet_add_preferences(applet, "/schemas/apps/gweather/prefs", NULL);
-	
+
 	gw_applet = g_new0(GWeatherApplet, 1);   
 	
 	gw_applet->applet = applet;
Index: gweather/Makefile.am
===================================================================
--- gweather/Makefile.am	(revision 11169)
+++ gweather/Makefile.am	(working copy)
@@ -1,11 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = docs
+SUBDIRS = docs icons
 
 INCLUDES =				\
 	-I$(srcdir)			\
 	-I$(top_srcdir)			\
 	-DGTK_ENABLE_BROKEN		\
+ 	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)/$(subdir)\"	\
 	$(GNOME_APPLETS_CFLAGS)		\
 	$(GNOME_LIBS2_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
Index: gweather/gweather-applet.c
===================================================================
--- gweather/gweather-applet.c	(revision 11169)
+++ gweather/gweather-applet.c	(working copy)
@@ -44,6 +44,7 @@
 #include "gweather-applet.h"
 
 #define MAX_CONSECUTIVE_FAULTS (3)
+#define N_MOONPHASES           36
 
 static void about_cb (BonoboUIComponent *uic,
 		      GWeatherApplet    *gw_applet,
@@ -123,6 +124,19 @@
         BONOBO_UI_VERB_END
 };
 
+const char*
+gweather_info_get_icon_name (WeatherInfo *info)
+{
+    gboolean     isMoon;
+    gdouble      moonphase;
+    gint         phase;
+    static char  icon_buffer[32];
+    const gchar* icon_name;
+
+    return weather_info_get_icon_name (info, N_MOONPHASES);
+
+}
+
 static void place_widgets (GWeatherApplet *gw_applet)
 {
     GtkRequisition req;
@@ -131,7 +145,7 @@
     int panel_size = gw_applet->size;
     const gchar *temp;   
     const gchar *icon_name;
-	
+
     switch (gw_applet->orient) {
 	case PANEL_APPLET_ORIENT_LEFT:
 	case PANEL_APPLET_ORIENT_RIGHT:
@@ -144,9 +158,8 @@
     }
 
     /* Create the weather icon */
-    icon_name = weather_info_get_icon_name (gw_applet->gweather_info);
+    icon_name = gweather_info_get_icon_name (gw_applet->gweather_info);
     gw_applet->image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); 
-
     if (icon_name != NULL) {
         gtk_widget_size_request(gw_applet->image, &req);
         if (horizontal)
@@ -413,7 +426,7 @@
 	     (gw_fault_counter >= MAX_CONSECUTIVE_FAULTS))
     {
 	    gw_fault_counter = 0;
-            icon_name = weather_info_get_icon_name (gw_applet->gweather_info);
+            icon_name = gweather_info_get_icon_name (gw_applet->gweather_info);
             gtk_image_set_from_icon_name (GTK_IMAGE(gw_applet->image), 
                                           icon_name, GTK_ICON_SIZE_BUTTON);
 	      
@@ -458,7 +471,7 @@
 					 weather_info_get_sky (info),
 					 weather_info_get_temp_summary (info));
 
-			 icon = weather_info_get_icon_name (gw_applet->gweather_info);
+			 icon = gweather_info_get_icon_name (gw_applet->gweather_info);
 			 if (icon == NULL)
 				 icon = "stock-unknown";
 	           	 
@@ -500,7 +513,7 @@
     WeatherPrefs prefs;
     const gchar *icon_name;
 
-    icon_name = weather_info_get_icon_name(gw_applet->gweather_info);
+    icon_name = gweather_info_get_icon_name(gw_applet->gweather_info);
     gtk_image_set_from_icon_name (GTK_IMAGE (gw_applet->image), 
     			          icon_name, GTK_ICON_SIZE_BUTTON); 
     gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet),  _("Updating..."));
