[Goodies-commits] r1442 - in xfce4-weather-plugin/trunk: . icons icons/48x48 panel-plugin
Nick Schermer
nick at xfce.org
Sun Jun 11 20:17:12 CEST 2006
Author: nick
Date: 2006-06-11 18:17:10 +0000 (Sun, 11 Jun 2006)
New Revision: 1442
Added:
xfce4-weather-plugin/trunk/icons/48x48/
xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
xfce4-weather-plugin/trunk/icons/48x48/xfce4-weather.png
Modified:
xfce4-weather-plugin/trunk/configure.ac
xfce4-weather-plugin/trunk/icons/Makefile.am
xfce4-weather-plugin/trunk/panel-plugin/Makefile.am
xfce4-weather-plugin/trunk/panel-plugin/config_dialog.c
xfce4-weather-plugin/trunk/panel-plugin/get_data.c
xfce4-weather-plugin/trunk/panel-plugin/http_client.c
xfce4-weather-plugin/trunk/panel-plugin/icon.c
xfce4-weather-plugin/trunk/panel-plugin/parsers.c
xfce4-weather-plugin/trunk/panel-plugin/plugin.c
xfce4-weather-plugin/trunk/panel-plugin/scrollbox.c
xfce4-weather-plugin/trunk/panel-plugin/search_dialog.c
xfce4-weather-plugin/trunk/panel-plugin/summary_window.c
xfce4-weather-plugin/trunk/panel-plugin/translate.c
xfce4-weather-plugin/trunk/panel-plugin/weather.desktop.in.in
Log:
>From Berios:
* Reorder the includes a bit
* Changed titled dialog
* Added icon for the panel add items dialog
Modified: xfce4-weather-plugin/trunk/configure.ac
===================================================================
--- xfce4-weather-plugin/trunk/configure.ac 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/configure.ac 2006-06-11 18:17:10 UTC (rev 1442)
@@ -28,6 +28,7 @@
dnl Check for standard header files
AC_HEADER_STDC
+AC_CHECK_HEADERS([string.h fcntl.h errno.h sys/socket.h netdb.h netinet/in.h sys/types.h unistd.h stdio.h])
dnl check for xml
XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0])
@@ -38,6 +39,8 @@
dnl check for gtk
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
dnl check for i18n support
@@ -69,5 +72,6 @@
po/Makefile.in
icons/Makefile
icons/liquid/Makefile
+icons/48x48/Makefile
])
Added: xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/48x48/Makefile.am (rev 0)
+++ xfce4-weather-plugin/trunk/icons/48x48/Makefile.am 2006-06-11 18:17:10 UTC (rev 1442)
@@ -0,0 +1,7 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = \
+ xfce4-weather.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
Property changes on: xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
___________________________________________________________________
Name: svn:executable
+ *
Added: xfce4-weather-plugin/trunk/icons/48x48/xfce4-weather.png
===================================================================
(Binary files differ)
Property changes on: xfce4-weather-plugin/trunk/icons/48x48/xfce4-weather.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: xfce4-weather-plugin/trunk/icons/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/Makefile.am 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/icons/Makefile.am 2006-06-11 18:17:10 UTC (rev 1442)
@@ -1,6 +1,16 @@
-# $Id: Makefile.am 20832 2006-04-09 17:40:51Z benny $
-
SUBDIRS = \
- liquid
+ liquid \
+ 48x48
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. Remember to run:"; \
+ echo "***"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ echo "***"; \
+ fi
Modified: xfce4-weather-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/Makefile.am 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/Makefile.am 2006-06-11 18:17:10 UTC (rev 1442)
@@ -1,40 +1,46 @@
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-weather-plugin
+xfce4_weather_plugin_SOURCES = \
+ scrollbox.h \
+ scrollbox.c \
+ parsers.h \
+ parsers.c \
+ get_data.h \
+ get_data.c \
+ http_client.c \
+ http_client.h \
+ plugin.h \
+ plugin.c \
+ config_dialog.h \
+ config_dialog.c \
+ summary_window.h \
+ summary_window.c \
+ icon.h \
+ icon.c \
+ search_dialog.h \
+ search_dialog.c \
+ translate.h \
+ translate.c
+
xfce4_weather_plugin_CFLAGS = \
+ -I$(top_srcdir) \
-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBXFCE4PANEL_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
+ @GLIB_CFLAGS@ \
+ @GTK_CFLAGS@ \
@LIBXML_CFLAGS@
xfce4_weather_plugin_LDFLAGS = \
- @LIBXFCE4PANEL_LIBS@ \
+ @LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
+ @GLIB_LIBS@ \
+ @GMODULE_LIBS@ \
+ @GTK_LIBS@ \
@LIBXML_LIBS@
-xfce4_weather_plugin_SOURCES = \
- config_dialog.c \
- config_dialog.h \
- get_data.c \
- get_data.h \
- http_client.c \
- http_client.h \
- parsers.c \
- parsers.h \
- plugin.c \
- plugin.h \
- scrollbox.c \
- scrollbox.h \
- summary_window.c \
- summary_window.h \
- icon.c \
- icon.h \
- search_dialog.c \
- search_dialog.h \
- translate.c \
- translate.h
-
# .desktop file
#
# Some automake trickery here. Because we cannot use $(libexecdir) in the
Modified: xfce4-weather-plugin/trunk/panel-plugin/config_dialog.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/config_dialog.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/config_dialog.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -20,7 +20,10 @@
#endif
#include <string.h>
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
+
#include <libxfcegui4/libxfcegui4.h>
#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxml/parser.h>
@@ -46,7 +49,7 @@
{N_("Humidity (H)"), HMID},
{N_("Visibility (V)"), VIS},
{N_("UV Index (UV)"), UV_INDEX},
- {N_("Dewpoint (DP)"), DEWP}
+ {N_("Dewpoint (DP)"), DEWP},
};
typedef void(*cb_function)(xfceweather_data *);
Modified: xfce4-weather-plugin/trunk/panel-plugin/get_data.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/get_data.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/get_data.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,10 +19,13 @@
#include <config.h>
#endif
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxml/parser.h>
+#include <libxfce4panel/xfce-panel-plugin.h>
+
#include "parsers.h"
#include "get_data.h"
#include "plugin.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/http_client.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/http_client.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/http_client.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -32,6 +32,7 @@
#include <stdio.h>
#include <glib.h>
+#include <gmodule.h>
#include "http_client.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/icon.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/icon.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/icon.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,6 +19,8 @@
#include <config.h>
#endif
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
#include "icon.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/parsers.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/parsers.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/parsers.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,8 +19,8 @@
#include <config.h>
#endif
-#include <gtk/gtk.h>
#include <glib.h>
+#include <gmodule.h>
#include <libxml/parser.h>
#include "parsers.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/plugin.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/plugin.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/plugin.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,14 +19,18 @@
#include <config.h>
#endif
+#include <string.h>
#include <sys/stat.h>
+#include <glib.h>
+#include <gmodule.h>
+#include <gtk/gtk.h>
+
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
-#include <libxml/parser.h>
-#include <gtk/gtk.h>
-#include <string.h>
#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxml/parser.h>
+
#include "parsers.h"
#include "get_data.h"
#include "plugin.h"
@@ -592,13 +596,11 @@
xfce_panel_plugin_block_menu (plugin);
#ifdef USE_NEW_DIALOG
- dlg = xfce_titled_dialog_new_with_buttons (_("Weather Plugin"),
- NULL,
- GTK_DIALOG_NO_SEPARATOR,
+ dlg = xfce_titled_dialog_new_with_buttons (_("Weather Update"),
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
- xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg),
- _("Configure the weather plugin"));
#else
dlg = gtk_dialog_new_with_buttons (_("Properties"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
@@ -608,7 +610,7 @@
NULL);
#endif
gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "gtk-properties");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
#ifndef USE_NEW_DIALOG
header = xfce_create_header (NULL, _("Weather Update"));
@@ -716,13 +718,20 @@
data->updatetimeout = 0;
}
+ free_get_data_buffer ();
+ xmlCleanupParser ();
+
+ /* Free Tooltip */
+ gtk_tooltips_set_tip (data->tooltips, data->tooltipbox, NULL, NULL);
+ g_object_unref (data->tooltips);
+
+ /* Free chars */
g_free (data->location_code);
- free_get_data_buffer ();
+ g_free (data->proxy_host);
+ /* Free Array */
g_array_free (data->labels, TRUE);
- xmlCleanupParser ();
-
g_free (data);
}
Modified: xfce4-weather-plugin/trunk/panel-plugin/scrollbox.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/scrollbox.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/scrollbox.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,6 +19,8 @@
#include <config.h>
#endif
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
#include "scrollbox.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/search_dialog.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/search_dialog.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/search_dialog.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -20,9 +20,11 @@
#endif
#include <string.h>
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
+#include <libxml/parser.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxml/parser.h>
#include "parsers.h"
#include "get_data.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/summary_window.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/summary_window.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/summary_window.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -19,10 +19,12 @@
#include <config.h>
#endif
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
+#include <libxml/parser.h>
#include <libxfcegui4/libxfcegui4.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxml/parser.h>
#include "parsers.h"
#include "get_data.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/translate.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/translate.c 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/translate.c 2006-06-11 18:17:10 UTC (rev 1442)
@@ -20,10 +20,12 @@
#endif
#include <string.h>
+#include <time.h>
+
+#include <glib.h>
#include <gtk/gtk.h>
+#include <libxml/parser.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxml/parser.h>
-#include <time.h>
#include "parsers.h"
#include "get_data.h"
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather.desktop.in.in
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather.desktop.in.in 2006-06-11 18:04:42 UTC (rev 1441)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather.desktop.in.in 2006-06-11 18:17:10 UTC (rev 1442)
@@ -2,7 +2,7 @@
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
_Name=Weather Update
-_Comment=show current weather conditions
-Icon=xfce-mouse
+_Comment=Show current weather conditions
+Icon=xfce4-weather
X-XFCE-Exec=@PLUGIN_PATH@/xfce4-weather-plugin
More information about the Goodies-commits
mailing list