diff options
| author | Philip Langdale <philipl@mail.utexas.edu> | 2005-12-11 21:28:59 +0000 |
|---|---|---|
| committer | Philip Langdale <philipl@src.gnome.org> | 2005-12-11 21:28:59 +0000 |
| commit | 2e4ef15129948bc987174645e9c58744fc29cda2 (patch) | |
| tree | 75fcd36318ee0ab1f0090b3d55f0a652278880e9 | |
| parent | 4feffdf186e04ed262b004cabf40aa57f25b1f79 (diff) | |
R libgweatherprefs libgweather gweather configure.in MergedGWEATHER_REFACTOR
2005-12-11 Philip Langdale <philipl@mail.utexas.edu>
R libgweatherprefs
* libgweather
* gweather
* configure.in
* Makefile.am: Merged libgweatherprefs into libgweather.
Updated gweather accordingly.
27 files changed, 118 insertions, 136 deletions
@@ -1,3 +1,12 @@ +2005-12-11 Philip Langdale <philipl@mail.utexas.edu> + + R libgweatherprefs + * libgweather + * gweather + * configure.in + * Makefile.am: Merged libgweatherprefs into libgweather. + Updated gweather accordingly. + 2005-12-04 Philip Langdale <philipl@mail.utexas.edu> * libgweatherprefs: See the library ChangeLog for details. diff --git a/Makefile.am b/Makefile.am index 8b039841d..06c7f9b4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ endif vfs_applets = \ gtik \ libgweather \ - libgweatherprefs \ gweather \ trashapplet if BUILD_GNOME_VFS_APPLETS @@ -75,7 +74,6 @@ DIST_SUBDIRS = \ multiload \ gtik \ libgweather \ - libgweatherprefs\ gweather \ man \ accessx-status \ diff --git a/configure.in b/configure.in index 788e46ec8..3e1a5b121 100644 --- a/configure.in +++ b/configure.in @@ -580,8 +580,6 @@ gtik/access/Makefile gtik/help/Makefile libgweather/Makefile libgweather/gweather.pc -libgweatherprefs/Makefile -libgweatherprefs/gweatherprefs.pc gweather/Makefile gweather/docs/Makefile geyes/Makefile diff --git a/gweather/Makefile.am b/gweather/Makefile.am index d4354d522..6f79dc3c7 100644 --- a/gweather/Makefile.am +++ b/gweather/Makefile.am @@ -26,8 +26,7 @@ gweather_applet_2_LDADD = \ $(LIBNOTIFY_LIBS) \ $(GNOME_APPLETS_LIBS) \ $(GNOME_VFS_APPLETS_LIBS) \ - ../libgweather/libgweather.la \ - ../libgweatherprefs/libgweatherprefs.la + ../libgweather/libgweather.la uidir = $(datadir)/gnome-2.0/ui ui_DATA = GNOME_GWeatherApplet.xml diff --git a/gweather/gweather.h b/gweather/gweather.h index 22826be09..c3f398f3e 100644 --- a/gweather/gweather.h +++ b/gweather/gweather.h @@ -14,8 +14,8 @@ #include <gnome.h> #include <panel-applet.h> -#include <libgweatherprefs/gweather-gconf.h> -#include <libgweatherprefs/gweather-prefs.h> +#include <libgweather/gweather-gconf.h> +#include <libgweather/gweather-prefs.h> /* Radar map on by default. */ diff --git a/gweather/main.c b/gweather/main.c index 017161d87..c4fe9ca5a 100644 --- a/gweather/main.c +++ b/gweather/main.c @@ -15,8 +15,8 @@ #include <gnome.h> #include <panel-applet.h> -#include <libgweatherprefs/gweather-gconf.h> -#include <libgweatherprefs/gweather-prefs.h> +#include <libgweather/gweather-gconf.h> +#include <libgweather/gweather-prefs.h> #include "gweather.h" #include "gweather-pref.h" diff --git a/libgweather/.cvsignore b/libgweather/.cvsignore index 8d25b85b3..500554b10 100644 --- a/libgweather/.cvsignore +++ b/libgweather/.cvsignore @@ -4,3 +4,4 @@ Makefile.in *.pc *.o *.lo +gweather.schemas.in diff --git a/libgweather/AUTHORS b/libgweather/AUTHORS new file mode 100644 index 000000000..15f2d9f99 --- /dev/null +++ b/libgweather/AUTHORS @@ -0,0 +1,5 @@ +The library: +Philip Langdale <philipl@mail.utexas.edu> + +Almost all of the code is refactored from the gweather applet, +so checkout that AUTHORS file too. diff --git a/libgweather/ChangeLog b/libgweather/ChangeLog index be8b061c8..ed13e57f9 100644 --- a/libgweather/ChangeLog +++ b/libgweather/ChangeLog @@ -1,3 +1,70 @@ +2005-12-11 Philip Langdale <philipl@mail.utexas.edu> + + A gweather-gconf.c + A gweather-gconf.h + A gweather-prefs.c + A gweather-prefs.h + A gweather.schemas.in: Merge libgweatherprefs into + libgweather. The extra library isn't worth the hassle + considering that gconf is already a dependency of + libgweather and we currently have no clients that want + the backend without the prefs. + + I have merged the libgweathepref ChangeLong entries. + + * .cvsignore + * ChangeLog + * Makefile.am + * README + * weather-iwin.c + * weather-metar.c + * weather-wx.c + * weather.c: Update to reflect the merged files. + + A AUTHORS: + R MAINTAINERS: A more accurate description of what + I want to claim at this time. :-) + +2005-12-04 Philip Langdale <philipl@mail.utexas.edu> + + * gweather-gconf.c + * gweather-gconf.h: Add gweather_gconf_get_client + to provide access to the GConfClient. + + * gweather-prefs.c: make gweather_prefs_load work + correctly when called multiple times. The old + radar url was not previously being freed. + +2005-11-27 Philip Langdale <philipl@mail.utexas.edu> + + Initial checkin of libgweatherprefs. + + A .cvsignore + A ChangeLog + A MAINTAINERS + A Makefile.am + A README: Usual building blocks. + + A gweather.schemas.in: Brought the schemas over + unchanged from gweather. + + A gweatherprefs.pc.in: pkgconfig descriptor. + + A gweather-gconf.c + A gweather-gconf.h: Primarily, this encapsulates + the 'current path' notion in an identical way + to libpanelapplet. It is also the new home of + 'weather_location_config_read' which files out + a WeatherLocation struct based on the values in + gconf. + + A gweather-prefs.c + A gweather-prefs.h: This is, essentially unchanged, + the 'gweather_pref_load' function along with the + enum-to-string helpers it depends on. Obviously + the gconf access now uses the gweather-gconf + methods rather than the panel applet ones. + 2005-11-27 Philip Langdale <philipl@mail.utexas.edu> A .cvsignore: diff --git a/libgweather/MAINTAINERS b/libgweather/MAINTAINERS deleted file mode 100644 index d76109f3a..000000000 --- a/libgweather/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Philip Langdale <philipl@mail.utexas.edu> Me? Eeek! diff --git a/libgweather/Makefile.am b/libgweather/Makefile.am index acd1ee3ed..e4703e8f2 100644 --- a/libgweather/Makefile.am +++ b/libgweather/Makefile.am @@ -3,7 +3,7 @@ LIBRARY_VERSION = 0:0:0 lib_LTLIBRARIES = libgweather.la libgweatherincdir = $(includedir)/libgweather -libgweatherinc_HEADERS = weather.h +libgweatherinc_HEADERS = weather.h gweather-gconf.h gweather-prefs.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gweather.pc @@ -11,7 +11,9 @@ pkgconfig_DATA = gweather.pc libgweather_la_SOURCES = \ weather.c weather.h weather-priv.h \ weather-metar.c weather-iwin.c weather-met.c \ - weather-bom.c weather-wx.c + weather-bom.c weather-wx.c \ + gweather-prefs.c gweather-prefs.h \ + gweather-gconf.c gweather-gconf.h libgweather_la_CFLAGS = \ -I$(top_srcdir) \ @@ -30,4 +32,19 @@ libgweather_la_LDFLAGS = \ noinst_HEADERS = weather-priv.h -EXTRA_DIST = gweather.pc.in +schemasdir = @GCONF_SCHEMA_FILE_DIR@ +schemas_in_files = gweather.schemas.in +schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) + +@INTLTOOL_SCHEMAS_RULE@ + +if GCONF_SCHEMAS_INSTALL +install-data-local: + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ; +uninstall-local: + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schemas_DATA) ; +endif + +CLEANFILES = $(schemas_DATA) + +EXTRA_DIST = gweather.pc.in $(schemas_in_files) diff --git a/libgweather/README b/libgweather/README index e92c99537..989c0cdb4 100644 --- a/libgweather/README +++ b/libgweather/README @@ -3,5 +3,5 @@ libgweather libgweather is the retrieval backend from the gweather gnome-applet. It's generally useful for applications that need to get weather -information. As the low level library, it does not introduce any -awareness of the gweather gconf prefs or locations database. +information. It also includes helper functions to access the gweather +gconf schema. diff --git a/libgweatherprefs/gweather-gconf.c b/libgweather/gweather-gconf.c index d8ad52c60..93a7ae734 100644 --- a/libgweatherprefs/gweather-gconf.c +++ b/libgweather/gweather-gconf.c @@ -28,8 +28,8 @@ #endif #include <string.h> -#include <glib/gi18n.h> -#include <libgweatherprefs/gweather-gconf.h> +#include <glib/gi18n-lib.h> +#include <libgweather/gweather-gconf.h> struct _GWeatherGConf { diff --git a/libgweatherprefs/gweather-gconf.h b/libgweather/gweather-gconf.h index e5446a29d..e5446a29d 100644 --- a/libgweatherprefs/gweather-gconf.h +++ b/libgweather/gweather-gconf.h diff --git a/libgweatherprefs/gweather-prefs.c b/libgweather/gweather-prefs.c index 464bea29f..44b633a76 100644 --- a/libgweatherprefs/gweather-prefs.c +++ b/libgweather/gweather-prefs.c @@ -12,9 +12,9 @@ # include <config.h> #endif -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gconf/gconf-client.h> -#include <libgweatherprefs/gweather-prefs.h> +#include <libgweather/gweather-prefs.h> static GConfEnumStringPair temp_unit_enum_map [] = { { TEMP_UNIT_DEFAULT, "Default" }, diff --git a/libgweatherprefs/gweather-prefs.h b/libgweather/gweather-prefs.h index 1759e5418..44824ff33 100644 --- a/libgweatherprefs/gweather-prefs.h +++ b/libgweather/gweather-prefs.h @@ -12,7 +12,7 @@ #define __GWEATHER_PREFS_H_ #include <libgweather/weather.h> -#include <libgweatherprefs/gweather-gconf.h> +#include <libgweather/gweather-gconf.h> /* gconf keys */ #define GCONF_TEMP_UNIT "temperature_unit" diff --git a/libgweatherprefs/gweather.schemas.in b/libgweather/gweather.schemas.in index ea726b1f8..ea726b1f8 100644 --- a/libgweatherprefs/gweather.schemas.in +++ b/libgweather/gweather.schemas.in diff --git a/libgweather/weather-iwin.c b/libgweather/weather-iwin.c index 757d4c81f..591710ab4 100644 --- a/libgweather/weather-iwin.c +++ b/libgweather/weather-iwin.c @@ -19,7 +19,7 @@ #include <string.h> #include <sys/types.h> #include <regex.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libgweather/weather.h> #include "weather-priv.h" diff --git a/libgweather/weather-metar.c b/libgweather/weather-metar.c index 897b8bb8a..0045e3a7c 100644 --- a/libgweather/weather-metar.c +++ b/libgweather/weather-metar.c @@ -22,7 +22,7 @@ #include <string.h> #include <sys/types.h> #include <regex.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libgweather/weather.h> #include "weather-priv.h" diff --git a/libgweather/weather-wx.c b/libgweather/weather-wx.c index 095e1fd61..1154bf3c3 100644 --- a/libgweather/weather-wx.c +++ b/libgweather/weather-wx.c @@ -14,7 +14,7 @@ # include <config.h> #endif -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libgweather/weather.h> #include "weather-priv.h" diff --git a/libgweather/weather.c b/libgweather/weather.c index 661d5c123..8ada1a4a5 100644 --- a/libgweather/weather.c +++ b/libgweather/weather.c @@ -32,7 +32,7 @@ #include <time.h> #include <unistd.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtkicontheme.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> diff --git a/libgweatherprefs/.cvsignore b/libgweatherprefs/.cvsignore deleted file mode 100644 index e0911abc0..000000000 --- a/libgweatherprefs/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -Makefile -Makefile.in -gweather.schemas -*.pc -*.o -*.lo diff --git a/libgweatherprefs/ChangeLog b/libgweatherprefs/ChangeLog deleted file mode 100644 index 206480fb7..000000000 --- a/libgweatherprefs/ChangeLog +++ /dev/null @@ -1,39 +0,0 @@ -2005-12-04 Philip Langdale <philipl@mail.utexas.edu> - - * gweather-gconf.c - * gweather-gconf.h: Add gweather_gconf_get_client - to provide access to the GConfClient. - - * gweather-prefs.c: make gweather_prefs_load work - correctly when called multiple times. The old - radar url was not previously being freed. - -2005-11-27 Philip Langdale <philipl@mail.utexas.edu> - - Initial checkin of libgweatherprefs. - - A .cvsignore - A ChangeLog - A MAINTAINERS - A Makefile.am - A README: Usual building blocks. - - A gweather.schemas.in: Brought the schemas over - unchanged from gweather. - - A gweatherprefs.pc.in: pkgconfig descriptor. - - A gweather-gconf.c - A gweather-gconf.h: Primarily, this encapsulates - the 'current path' notion in an identical way - to libpanelapplet. It is also the new home of - 'weather_location_config_read' which files out - a WeatherLocation struct based on the values in - gconf. - - A gweather-prefs.c - A gweather-prefs.h: This is, essentially unchanged, - the 'gweather_pref_load' function along with the - enum-to-string helpers it depends on. Obviously - the gconf access now uses the gweather-gconf - methods rather than the panel applet ones. diff --git a/libgweatherprefs/MAINTAINERS b/libgweatherprefs/MAINTAINERS deleted file mode 100644 index d76109f3a..000000000 --- a/libgweatherprefs/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Philip Langdale <philipl@mail.utexas.edu> Me? Eeek! diff --git a/libgweatherprefs/Makefile.am b/libgweatherprefs/Makefile.am deleted file mode 100644 index 974e9897f..000000000 --- a/libgweatherprefs/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -LIBRARY_VERSION = 0:0:0 - -lib_LTLIBRARIES = libgweatherprefs.la - -libgweatherprefsincdir = $(includedir)/libgweatherprefs -libgweatherprefsinc_HEADERS = gweather-prefs.h gweather-gconf.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gweatherprefs.pc - -libgweatherprefs_la_SOURCES = \ - gweather-prefs.c gweather-prefs.h \ - gweather-gconf.c gweather-gconf.h - -libgweatherprefs_la_CFLAGS = \ - -I$(top_srcdir) \ - -I$(srcdir) \ - $(WARN_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GNOME_VFS_APPLETS_CFLAGS) \ - -DG_LOG_DOMAIN=\"GWeatherPrefs\" - -libgweatherprefs_la_LIBADD = \ - ../libgweather/libgweather.la - -libgweatherprefs_la_LDFLAGS = \ - -version-info $(LIBRARY_VERSION) - -schemasdir = @GCONF_SCHEMA_FILE_DIR@ -schemas_in_files = gweather.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) - -CLEANFILES = $(schemas_DATA) - -EXTRA_DIST = gweatherprefs.pc.in \ - $(schemas_in_files) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ; -uninstall-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schemas_DATA) ; -endif diff --git a/libgweatherprefs/README b/libgweatherprefs/README deleted file mode 100644 index 529ff22ff..000000000 --- a/libgweatherprefs/README +++ /dev/null @@ -1,8 +0,0 @@ -libgweatherprefs ----------------- - -libgweatherprefs builds on top of libgweather by providing -the schema for the prefs and location info stored in gconf. -The absolute location in gconf is up to the caller of the -library but if this location is shared, then multiple -clients can share their prefs. diff --git a/libgweatherprefs/gweatherprefs.pc.in b/libgweatherprefs/gweatherprefs.pc.in deleted file mode 100644 index bb7f3d105..000000000 --- a/libgweatherprefs/gweatherprefs.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: GWeatherPrefs -Description: GWeather Prefs shared Library -Version: @VERSION@ -Requires: gweather -Libs: -L${libdir} -Cflags: -I${includedir} |