aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/calendar-weather
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/calendar-weather')
-rw-r--r--plugins/calendar-weather/ChangeLog140
-rw-r--r--plugins/calendar-weather/calendar-weather.c14
2 files changed, 8 insertions, 146 deletions
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
deleted file mode 100644
index 8aa7f8990c..0000000000
--- a/plugins/calendar-weather/ChangeLog
+++ /dev/null
@@ -1,140 +0,0 @@
-2009-04-24 Milan Crha <mcrha@redhat.com>
-
- ** Fix for bug #572348
-
- * calendar-weather.c: Remove deprecated Gtk+ symbols.
-
-2008-12-10 Suman Manjunath <msuman@novell.com>
-
- * Makefile.am: Don't try to specify LIBGWEATHER_(CFLAGS|LIBS), they
- will be provided by configure.in.
-
-2008-12-03 Milan Crha <mcrha@redhat.com>
-
- ** Part of fix for bug #352287
-
- * Makefile.am: Compile and link with libgweather.
- * calendar-weather.c: (e_plugin_lib_enable), (selection_changed),
- (find_location_func), (find_location), (treeview_clicked),
- (create_source_selector), (build_location_path),
- (location_clicked), (e_calendar_weather_location):
- Use libgweather for weather calendar.
-
-2008-07-31 Matthew Barnes <mbarnes@redhat.com>
-
- ** Fixes part of bug #545568
-
- * org-gnome-calendar-weather.eplug.xml:
- Add "system_plugin=true" so it's not shown in the Plugin Manager.
- This plugin is not designed to be disabled by the user.
-
-2008-03-31 Suman Manjunath <msuman@novell.com>
-
- ** Fix for bug #346555
-
- * calendar-weather.c: (e_calendar_weather_refresh):
- Fixed a mnemonic conflict.
-
-2007-10-26 Kjartan Maraas <kmaraas@gnome.org>
-
- * calendar-weather.c: (load_locations), (treeview_clicked):
- ANSIfication of function declaration.
-
-2007-05-24 Matthew Barnes <mbarnes@redhat.com>
-
- * calendar-weather.c (e_calendar_weather_location):
- Remove check for obsolete GTK+ version (#424562).
-
-2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
-
- * calendar-weather.c: (e_plugin_lib_enable), (parse_subtree),
- (location_clicked), (e_calendar_weather_location),
- (e_calendar_weather_refresh), (set_units),
- (e_calendar_weather_units): fix casts in strcmp,
- fixes part of bug #437584.
-
-2007-03-20 Matthew Barnes <mbarnes@redhat.com>
-
- ** Fixes part of bug #419524
-
- * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
-
-2005-07-13 Tor Lillqvist <tml@novell.com>
-
- * calendar-weather.c (e_calendar_weather_migrate): Don't return a
- value from a void funtion.
-
-2005-06-27 Tor Lillqvist <tml@novell.com>
-
- * Makefile.am: There is no EVOLUTION_CFLAGS. Use
- NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS.
-
-2005-06-18 Tor Lillqvist <tml@novell.com>
-
- * org-gnome-calendar-weather.eplug.xml: Use SOEXT.
-
-2005-05-11 Not Zed <NotZed@Ximian.com>
-
- * Makefile.am: added built_sources/cleanfiles
-
-2005-05-06 Not Zed <NotZed@Ximian.com>
-
- * Makefile.am:
-
- * org-gnome-calendar-weather.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-03-22 David Trowbridge <trowbrds@cs.colorado.edu>
-
- * Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get
- rid of an incorrect comment
-
-2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
-
- * org-gnome-calendar-weather.eplug.in: Add a . to the end of description.
-
-2005-02-02 Rodney Dawes <dobey@novell.com>
-
- * Makefile.am (INCLUDES): Use $(weatherdir) instead of duplicating the
- define for it below
- (weatherdir): Fix to use the correct versioned directory
-
-2005-01-26 David Trowbridge <trowbrds@cs.colorado.edu>
-
- * org-gnome-calendar-weather.eplug.in: fix typo
-
-2005-01-25 Rodrigo Moya <rodrigo@novell.com>
-
- * calendar-weather.c (e_plugin_lib_enable): set all new categories to
- not searchable.
-
-2005-01-12 David Trowbridge <trowbrds@cs.colorado.edu>
-
- * calendar-weather.c (e_calendar_weather_units): fix spelling
-
-2005-01-12 David Trowbridge <trowbrds@cs.colorado.edu>
-
- * calendar-weather.c, org-gnome-calendar-weather.eplug.in: use
- a single setting for metric/imperial rather than separate
- temperature and snowfall settings
-
-2005-01-10 Rodrigo Moya <rodrigo@novell.com>
-
- * calendar-weather.c (create_source_selected): use HIG-compliant
- button order.
-
-2005-01-07 Rodrigo Moya <rodrigo@novell.com>
-
- * Makefile.am: define EDS's datadir, needed to get to the
- Locations.xml file.
-
- * calendar-weather.c (load_locations): use EDS's datadir for the
- Locations.xml file full path.
-
-2005-01-07 Rodrigo Moya <rodrigo@novell.com>
-
- * Makefile.am: define weatherdatadir here, no need to use e-d-s's one,
- use evolution's instead.
-
-2005-01-06 David Trowbridge <trowbrds@cs.colorado.edu>
-
- * Initial import of weather properties plugin
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 50c698da28..61180b7153 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -208,6 +208,7 @@ static GtkDialog *
create_source_selector (ESource *source)
{
GtkWidget *dialog, *treeview, *scrolledwindow;
+ GtkWidget *content_area;
GtkCellRenderer *text;
GtkTreeSelection *selection;
gchar *uri_text;
@@ -256,9 +257,10 @@ create_source_selector (ESource *source)
text = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), -1, "location", text, "text", 0, NULL);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scrolledwindow);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_container_add (GTK_CONTAINER (content_area), scrolledwindow);
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 6);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 6);
+ gtk_box_set_spacing (GTK_BOX (content_area), 6);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
gtk_window_set_default_size (GTK_WINDOW (dialog), 420, 340);
@@ -334,7 +336,7 @@ GtkWidget *
e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data)
{
GtkWidget *button, *parent, *text, *label;
- gint row;
+ guint row;
ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
ESource *source = t->source;
SoupURI *suri;
@@ -351,7 +353,7 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data)
parent = data->parent;
- row = ((GtkTable*)parent)->nrows;
+ g_object_get (parent, "n-rows", &row, NULL);
label = gtk_label_new_with_mnemonic (_("_Location:"));
gtk_widget_show (label);
@@ -432,7 +434,7 @@ GtkWidget *
e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
{
GtkWidget *combobox, *parent, *label;
- gint row;
+ guint row;
ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
ESource *source = t->source;
@@ -441,7 +443,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
parent = data->parent;
- row = ((GtkTable*)parent)->nrows;
+ g_object_get (parent, "n-rows", &row, NULL);
label = gtk_label_new_with_mnemonic (_("_Units:"));
gtk_widget_show (label);