[Xfce4-commits] <xfce4-weather-plugin:master> Rename xfceweather_data to plugin_data and fix some compile warnings.
Harald Judt
noreply at xfce.org
Sun Dec 9 23:44:26 CET 2012
Updating branch refs/heads/master
to c6c608b5fe6ec5f8155c97b80540f383ce55a92a (commit)
from e1f2d5cd89066ad06dd660302a8930e4f5462e0c (commit)
commit c6c608b5fe6ec5f8155c97b80540f383ce55a92a
Author: Harald Judt <h.judt at gmx.at>
Date: Sun Dec 9 19:24:44 2012 +0100
Rename xfceweather_data to plugin_data and fix some compile warnings.
panel-plugin/weather-config.c | 202 ++++++++++++++++++++--------------------
panel-plugin/weather-config.h | 4 +-
panel-plugin/weather-debug.c | 4 +-
panel-plugin/weather-debug.h | 2 +-
panel-plugin/weather-parsers.c | 8 +-
panel-plugin/weather-summary.c | 12 +-
panel-plugin/weather-summary.h | 2 +-
panel-plugin/weather.c | 76 ++++++++--------
panel-plugin/weather.h | 12 +-
9 files changed, 161 insertions(+), 161 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 82c17c7..5877a2c 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -116,21 +116,21 @@ static void
update_summary_window(xfceweather_dialog *dialog,
gboolean restore_position)
{
- if (dialog->wd->summary_window) {
- guint x, y;
+ if (dialog->pd->summary_window) {
+ gint x, y;
/* remember position */
if (restore_position)
- gtk_window_get_position(GTK_WINDOW(dialog->wd->summary_window),
+ gtk_window_get_position(GTK_WINDOW(dialog->pd->summary_window),
&x, &y);
/* call toggle function two times to close and open dialog */
- forecast_click(dialog->wd->summary_window, dialog->wd);
- forecast_click(dialog->wd->summary_window, dialog->wd);
+ forecast_click(dialog->pd->summary_window, dialog->pd);
+ forecast_click(dialog->pd->summary_window, dialog->pd);
/* ask wm to restore position of new window */
if (restore_position)
- gtk_window_move(GTK_WINDOW(dialog->wd->summary_window), x, y);
+ gtk_window_move(GTK_WINDOW(dialog->pd->summary_window), x, y);
/* bring config dialog to the front, it might have been hidden
* beneath the summary window */
@@ -149,10 +149,10 @@ schedule_data_update(gpointer user_data)
/* force update of downloaded data */
weather_debug("Delayed update timer expired, now scheduling data update.");
- update_weatherdata_with_reset(dialog->wd, TRUE);
+ update_weatherdata_with_reset(dialog->pd, TRUE);
/* make use of previously saved data */
- read_cache_file(dialog->wd);
+ read_cache_file(dialog->pd);
gtk_spinner_stop(GTK_SPINNER(dialog->update_spinner));
gtk_widget_hide(GTK_WIDGET(dialog->update_spinner));
@@ -169,8 +169,8 @@ schedule_delayed_data_update(xfceweather_dialog *dialog)
g_source_remove(dialog->timer_id);
/* stop any updates that could be performed by weather.c */
- if (dialog->wd->updatetimeout)
- g_source_remove(dialog->wd->updatetimeout);
+ if (dialog->pd->updatetimeout)
+ g_source_remove(dialog->pd->updatetimeout);
gtk_widget_show(GTK_WIDGET(dialog->update_spinner));
gtk_spinner_start(GTK_SPINNER(dialog->update_spinner));
@@ -233,7 +233,7 @@ cb_lookup_altitude(SoupSession *session,
alt = string_to_double(altitude->altitude, -9999);
weather_debug("Altitude returned by GeoNames: %.0f meters", alt);
if (alt >= -420) {
- if (dialog->wd->units->altitude == FEET)
+ if (dialog->pd->units->altitude == FEET)
alt /= 0.3048;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt),
alt);
@@ -283,14 +283,14 @@ lookup_altitude_timezone(const gpointer user_data)
url = g_strdup_printf("http://api.geonames.org"
"/srtm3XML?lat=%s&lng=%s&username=%s",
&latbuf[0], &lonbuf[0], GEONAMES_USERNAME);
- weather_http_queue_request(dialog->wd->session, url,
+ weather_http_queue_request(dialog->pd->session, url,
cb_lookup_altitude, user_data);
g_free(url);
/* lookup timezone */
url = g_strdup_printf("http://www.earthtools.org/timezone/%s/%s",
&latbuf[0], &lonbuf[0]);
- weather_http_queue_request(dialog->wd->session, url,
+ weather_http_queue_request(dialog->pd->session, url,
cb_lookup_timezone, user_data);
g_free(url);
}
@@ -340,7 +340,7 @@ start_auto_locate(xfceweather_dialog *dialog)
gtk_widget_set_sensitive(dialog->text_loc_name, FALSE);
gtk_entry_set_text(GTK_ENTRY(dialog->text_loc_name), _("Detecting..."));
gtk_spinner_start(GTK_SPINNER(dialog->update_spinner));
- weather_search_by_ip(dialog->wd->session, auto_locate_cb, dialog);
+ weather_search_by_ip(dialog->pd->session, auto_locate_cb, dialog);
}
@@ -353,7 +353,7 @@ cb_findlocation(GtkButton *button,
gchar *loc_name, *lat, *lon;
gchar latbuf[15], lonbuf[15];
- sdialog = create_search_dialog(NULL, dialog->wd->session);
+ sdialog = create_search_dialog(NULL, dialog->pd->session);
gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
if (run_search_dialog(sdialog)) {
@@ -385,14 +385,14 @@ setup_altitude(xfceweather_dialog *dialog)
g_signal_handlers_block_by_func(dialog->spin_alt,
G_CALLBACK(spin_alt_value_changed),
dialog);
- switch (dialog->wd->units->altitude) {
+ switch (dialog->pd->units->altitude) {
case METERS:
gtk_label_set_text(GTK_LABEL(dialog->label_alt_unit),
_("meters"));
gtk_spin_button_set_range(GTK_SPIN_BUTTON(dialog->spin_alt),
-420, 10000);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt),
- (gdouble) (dialog->wd->msl));
+ (gdouble) (dialog->pd->msl));
break;
case FEET:
@@ -401,7 +401,7 @@ setup_altitude(xfceweather_dialog *dialog)
gtk_spin_button_set_range(GTK_SPIN_BUTTON(dialog->spin_alt),
-1378.0, 32808);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt),
- (gdouble) dialog->wd->msl / 0.3048);
+ (gdouble) dialog->pd->msl / 0.3048);
break;
}
g_signal_handlers_unblock_by_func(dialog->spin_alt,
@@ -416,8 +416,8 @@ text_loc_name_changed(const GtkWidget *spin,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- g_free(dialog->wd->location_name);
- dialog->wd->location_name =
+ g_free(dialog->pd->location_name);
+ dialog->pd->location_name =
g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->text_loc_name)));
}
@@ -431,8 +431,8 @@ spin_lat_value_changed(const GtkWidget *spin,
gdouble val;
val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
- g_free(dialog->wd->lat);
- dialog->wd->lat = g_strdup(g_ascii_formatd(latbuf, 10, "%.6f", val));
+ g_free(dialog->pd->lat);
+ dialog->pd->lat = g_strdup(g_ascii_formatd(latbuf, 10, "%.6f", val));
schedule_delayed_data_update(dialog);
}
@@ -446,8 +446,8 @@ spin_lon_value_changed(const GtkWidget *spin,
gdouble val;
val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
- g_free(dialog->wd->lon);
- dialog->wd->lon = g_strdup(g_ascii_formatd(lonbuf, 10, "%.6f", val));
+ g_free(dialog->pd->lon);
+ dialog->pd->lon = g_strdup(g_ascii_formatd(lonbuf, 10, "%.6f", val));
schedule_delayed_data_update(dialog);
}
@@ -460,9 +460,9 @@ spin_alt_value_changed(const GtkWidget *spin,
gdouble val;
val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
- if (dialog->wd->units->altitude == FEET)
+ if (dialog->pd->units->altitude == FEET)
val *= 0.3048;
- dialog->wd->msl = (gint) val;
+ dialog->pd->msl = (gint) val;
schedule_delayed_data_update(dialog);
}
@@ -473,7 +473,7 @@ spin_timezone_value_changed(const GtkWidget *spin,
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->timezone =
+ dialog->pd->timezone =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
}
@@ -511,9 +511,9 @@ create_location_page(xfceweather_dialog *dialog)
G_CALLBACK(cb_findlocation), dialog);
gtk_box_pack_start(GTK_BOX(hbox), button_loc_change,
FALSE, FALSE, 0);
- if (dialog->wd->location_name)
+ if (dialog->pd->location_name)
gtk_entry_set_text(GTK_ENTRY(dialog->text_loc_name),
- dialog->wd->location_name);
+ dialog->pd->location_name);
else
gtk_entry_set_text(GTK_ENTRY(dialog->text_loc_name), _("Unset"));
/* update spinner */
@@ -526,7 +526,7 @@ create_location_page(xfceweather_dialog *dialog)
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("Latitud_e:"), sg_label);
ADD_SPIN(dialog->spin_lat, -90, 90, 1,
- (string_to_double(dialog->wd->lat, 0)), 6, sg_spin);
+ (string_to_double(dialog->pd->lat, 0)), 6, sg_spin);
SET_TOOLTIP(dialog->spin_lat,
_("Latitude specifies the north-south position of a point on "
"the Earth's surface. If you change this value manually, "
@@ -540,7 +540,7 @@ create_location_page(xfceweather_dialog *dialog)
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("L_ongitude:"), sg_label);
ADD_SPIN(dialog->spin_lon, -180, 180, 1,
- (string_to_double(dialog->wd->lon, 0)), 6, sg_spin);
+ (string_to_double(dialog->pd->lon, 0)), 6, sg_spin);
SET_TOOLTIP(dialog->spin_lon,
_("Longitude specifies the east-west position of a point on "
"the Earth's surface. If you change this value manually, "
@@ -553,7 +553,7 @@ create_location_page(xfceweather_dialog *dialog)
/* altitude */
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("_Altitude:"), sg_label);
- ADD_SPIN(dialog->spin_alt, -420, 10000, 1, dialog->wd->msl, 0, sg_spin);
+ ADD_SPIN(dialog->spin_alt, -420, 10000, 1, dialog->pd->msl, 0, sg_spin);
SET_TOOLTIP
(dialog->spin_alt,
_("For locations outside Norway the elevation model that's used by "
@@ -577,7 +577,7 @@ create_location_page(xfceweather_dialog *dialog)
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("_Timezone:"), sg_label);
ADD_SPIN(dialog->spin_timezone, -24, 24, 1,
- dialog->wd->timezone, 0, sg_spin);
+ dialog->pd->timezone, 0, sg_spin);
SET_TOOLTIP
(dialog->spin_timezone,
_("If the chosen location is not in your current timezone, this "
@@ -612,9 +612,9 @@ combo_unit_temperature_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->units->temperature =
+ dialog->pd->units->temperature =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -624,9 +624,9 @@ combo_unit_pressure_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->units->pressure =
+ dialog->pd->units->pressure =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -636,9 +636,9 @@ combo_unit_windspeed_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->units->windspeed =
+ dialog->pd->units->windspeed =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -648,9 +648,9 @@ combo_unit_precipitations_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->units->precipitations =
+ dialog->pd->units->precipitations =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -661,7 +661,7 @@ combo_unit_altitude_changed(GtkWidget *combo,
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->units->altitude =
+ dialog->pd->units->altitude =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
setup_altitude(dialog);
update_summary_window(dialog, TRUE);
@@ -735,8 +735,8 @@ create_units_page(xfceweather_dialog *dialog)
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, BORDER);
/* initialize widgets with current data */
- if (dialog->wd)
- setup_units(dialog, dialog->wd->units);
+ if (dialog->pd)
+ setup_units(dialog, dialog->pd->units);
gtk_box_pack_start(GTK_BOX(page), vbox, FALSE, FALSE, 0);
g_object_unref(G_OBJECT(sg_label));
@@ -751,7 +751,7 @@ combo_icon_theme_set_tooltip(GtkWidget *combo,
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
gchar *text;
- if (G_UNLIKELY(dialog->wd->icon_theme == NULL)) {
+ if (G_UNLIKELY(dialog->pd->icon_theme == NULL)) {
/* this should never happen, but who knows... */
gtk_widget_set_tooltip_text(GTK_WIDGET(combo),
_("Choose an icon theme."));
@@ -763,10 +763,10 @@ combo_icon_theme_set_tooltip(GtkWidget *combo,
"<b>Author:</b> %s\n\n"
"<b>Description:</b> %s\n\n"
"<b>License:</b> %s"),
- TEXT_UNKNOWN(dialog->wd->icon_theme->dir),
- TEXT_UNKNOWN(dialog->wd->icon_theme->author),
- TEXT_UNKNOWN(dialog->wd->icon_theme->description),
- TEXT_UNKNOWN(dialog->wd->icon_theme->license));
+ TEXT_UNKNOWN(dialog->pd->icon_theme->dir),
+ TEXT_UNKNOWN(dialog->pd->icon_theme->author),
+ TEXT_UNKNOWN(dialog->pd->icon_theme->description),
+ TEXT_UNKNOWN(dialog->pd->icon_theme->license));
gtk_widget_set_tooltip_markup(GTK_WIDGET(combo), text);
g_free(text);
}
@@ -784,14 +784,14 @@ combo_icon_theme_changed(GtkWidget *combo,
if (G_UNLIKELY(i == -1))
return;
- theme = g_array_index(dialog->icon_themes, icon_theme*, i);
+ theme = g_array_index(dialog->icon_themes, icon_theme *, i);
if (G_UNLIKELY(theme == NULL))
return;
- icon_theme_free(dialog->wd->icon_theme);
- dialog->wd->icon_theme = icon_theme_copy(theme);
+ icon_theme_free(dialog->pd->icon_theme);
+ dialog->pd->icon_theme = icon_theme_copy(theme);
combo_icon_theme_set_tooltip(combo, dialog);
- update_icon(dialog->wd);
+ update_icon(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -801,7 +801,7 @@ combo_tooltip_style_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->tooltip_style = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+ dialog->pd->tooltip_style = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
}
@@ -810,7 +810,7 @@ combo_forecast_layout_changed(GtkWidget *combo,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->forecast_layout =
+ dialog->pd->forecast_layout =
gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
update_summary_window(dialog, FALSE);
}
@@ -821,7 +821,7 @@ spin_forecast_days_value_changed(const GtkWidget *spin,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->forecast_days =
+ dialog->pd->forecast_days =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
update_summary_window(dialog, FALSE);
}
@@ -832,9 +832,9 @@ check_round_values_toggled(GtkWidget *button,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->round =
+ dialog->pd->round =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
update_summary_window(dialog, TRUE);
}
@@ -858,11 +858,11 @@ create_appearance_page(xfceweather_dialog *dialog)
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
dialog->icon_themes = find_icon_themes();
for (i = 0; i < dialog->icon_themes->len; i++) {
- theme = g_array_index(dialog->icon_themes, icon_theme*, i);
+ theme = g_array_index(dialog->icon_themes, icon_theme *, i);
ADD_COMBO_VALUE(dialog->combo_icon_theme, theme->name);
/* set selection to current theme */
- if (G_LIKELY(dialog->wd->icon_theme) &&
- !strcmp(theme->dir, dialog->wd->icon_theme->dir)) {
+ if (G_LIKELY(dialog->pd->icon_theme) &&
+ !strcmp(theme->dir, dialog->pd->icon_theme->dir)) {
SET_COMBO_VALUE(dialog->combo_icon_theme, i);
combo_icon_theme_set_tooltip(dialog->combo_icon_theme, dialog);
}
@@ -874,7 +874,7 @@ create_appearance_page(xfceweather_dialog *dialog)
ADD_COMBO(dialog->combo_tooltip_style);
ADD_COMBO_VALUE(dialog->combo_tooltip_style, _("Simple"));
ADD_COMBO_VALUE(dialog->combo_tooltip_style, _("Verbose"));
- SET_COMBO_VALUE(dialog->combo_tooltip_style, dialog->wd->tooltip_style);
+ SET_COMBO_VALUE(dialog->combo_tooltip_style, dialog->pd->tooltip_style);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), vbox, FALSE, FALSE, 0);
@@ -889,14 +889,14 @@ create_appearance_page(xfceweather_dialog *dialog)
ADD_COMBO_VALUE(dialog->combo_forecast_layout, _("Days in columns"));
ADD_COMBO_VALUE(dialog->combo_forecast_layout, _("Days in rows"));
SET_COMBO_VALUE(dialog->combo_forecast_layout,
- dialog->wd->forecast_layout);
+ dialog->pd->forecast_layout);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* number of days shown in forecast */
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("_Number of forecast _days:"), sg);
ADD_SPIN(dialog->spin_forecast_days, 1, MAX_FORECAST_DAYS, 1,
- (dialog->wd->forecast_days ? dialog->wd->forecast_days : 5),
+ (dialog->pd->forecast_days ? dialog->pd->forecast_days : 5),
0, NULL);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), vbox, FALSE, FALSE, 0);
@@ -914,7 +914,7 @@ create_appearance_page(xfceweather_dialog *dialog)
gtk_box_pack_start(GTK_BOX(vbox), dialog->check_round_values,
FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->check_round_values),
- dialog->wd->round);
+ dialog->pd->round);
gtk_box_pack_start(GTK_BOX(page), vbox, FALSE, FALSE, 0);
g_object_unref(G_OBJECT(sg));
@@ -927,9 +927,9 @@ check_scrollbox_show_toggled(GtkWidget *button,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->show_scrollbox =
+ dialog->pd->show_scrollbox =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
- scrollbox_set_visible(dialog->wd);
+ scrollbox_set_visible(dialog->pd);
}
@@ -938,9 +938,9 @@ spin_scrollbox_lines_value_changed(const GtkWidget *spin,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->scrollbox_lines =
+ dialog->pd->scrollbox_lines =
(guint) gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
}
@@ -955,9 +955,9 @@ button_scrollbox_font_pressed(GtkWidget *button,
return FALSE;
if (event->button == 2) {
- g_free(dialog->wd->scrollbox_font);
- dialog->wd->scrollbox_font = NULL;
- gtk_scrollbox_set_fontname(GTK_SCROLLBOX(dialog->wd->scrollbox),
+ g_free(dialog->pd->scrollbox_font);
+ dialog->pd->scrollbox_font = NULL;
+ gtk_scrollbox_set_fontname(GTK_SCROLLBOX(dialog->pd->scrollbox),
NULL);
gtk_button_set_label(GTK_BUTTON(button), _("Select _font"));
return TRUE;
@@ -977,18 +977,18 @@ button_scrollbox_font_clicked(GtkWidget *button,
fsd = GTK_FONT_SELECTION_DIALOG
(gtk_font_selection_dialog_new(_("Select font")));
- if (dialog->wd->scrollbox_font)
+ if (dialog->pd->scrollbox_font)
gtk_font_selection_dialog_set_font_name(fsd,
- dialog->wd->scrollbox_font);
+ dialog->pd->scrollbox_font);
result = gtk_dialog_run(GTK_DIALOG(fsd));
if (result == GTK_RESPONSE_OK || result == GTK_RESPONSE_ACCEPT) {
fontname = gtk_font_selection_dialog_get_font_name(fsd);
if (fontname != NULL) {
gtk_button_set_label(GTK_BUTTON(button), fontname);
- g_free(dialog->wd->scrollbox_font);
- dialog->wd->scrollbox_font = fontname;
- gtk_scrollbox_set_fontname(GTK_SCROLLBOX(dialog->wd->scrollbox),
+ g_free(dialog->pd->scrollbox_font);
+ dialog->pd->scrollbox_font = fontname;
+ gtk_scrollbox_set_fontname(GTK_SCROLLBOX(dialog->pd->scrollbox),
fontname);
}
}
@@ -1011,8 +1011,8 @@ button_scrollbox_color_pressed(GtkWidget *button,
return FALSE;
if (event->button == 2) {
- dialog->wd->scrollbox_use_color = FALSE;
- gtk_scrollbox_clear_color(GTK_SCROLLBOX(dialog->wd->scrollbox));
+ dialog->pd->scrollbox_use_color = FALSE;
+ gtk_scrollbox_clear_color(GTK_SCROLLBOX(dialog->pd->scrollbox));
return TRUE;
}
@@ -1027,10 +1027,10 @@ button_scrollbox_color_set(GtkWidget *button,
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
gtk_color_button_get_color(GTK_COLOR_BUTTON(button),
- &(dialog->wd->scrollbox_color));
- gtk_scrollbox_set_color(GTK_SCROLLBOX(dialog->wd->scrollbox),
- dialog->wd->scrollbox_color);
- dialog->wd->scrollbox_use_color = TRUE;
+ &(dialog->pd->scrollbox_color));
+ gtk_scrollbox_set_color(GTK_SCROLLBOX(dialog->pd->scrollbox),
+ dialog->pd->scrollbox_color);
+ dialog->pd->scrollbox_use_color = TRUE;
}
@@ -1061,7 +1061,7 @@ update_scrollbox_labels(xfceweather_dialog *dialog)
GValue value = { 0 };
gint option;
- dialog->wd->labels = labels_clear(dialog->wd->labels);
+ dialog->pd->labels = labels_clear(dialog->pd->labels);
hasiter =
gtk_tree_model_get_iter_first(GTK_TREE_MODEL
(dialog->model_datatypes),
@@ -1070,13 +1070,13 @@ update_scrollbox_labels(xfceweather_dialog *dialog)
gtk_tree_model_get_value(GTK_TREE_MODEL(dialog->model_datatypes),
&iter, 1, &value);
option = g_value_get_int(&value);
- g_array_append_val(dialog->wd->labels, option);
+ g_array_append_val(dialog->pd->labels, option);
g_value_unset(&value);
hasiter =
gtk_tree_model_iter_next(GTK_TREE_MODEL(dialog->model_datatypes),
&iter);
}
- update_scrollbox(dialog->wd);
+ update_scrollbox(dialog->pd);
}
@@ -1193,10 +1193,10 @@ check_scrollbox_animate_toggled(GtkWidget *button,
gpointer user_data)
{
xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
- dialog->wd->scrollbox_animate =
+ dialog->pd->scrollbox_animate =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
- gtk_scrollbox_set_animate(GTK_SCROLLBOX(dialog->wd->scrollbox),
- dialog->wd->scrollbox_animate);
+ gtk_scrollbox_set_animate(GTK_SCROLLBOX(dialog->pd->scrollbox),
+ dialog->pd->scrollbox_animate);
}
@@ -1223,14 +1223,14 @@ create_scrollbox_page(xfceweather_dialog *dialog)
TRUE, TRUE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
(dialog->check_scrollbox_show),
- dialog->wd->show_scrollbox);
+ dialog->pd->show_scrollbox);
/* values to show at once (multiple lines) */
label = gtk_label_new_with_mnemonic(_("L_ines:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
ADD_SPIN(dialog->spin_scrollbox_lines, 1, MAX_SCROLLBOX_LINES, 1,
- dialog->wd->scrollbox_lines, 0, sg_misc);
+ dialog->pd->scrollbox_lines, 0, sg_misc);
SET_TOOLTIP
(dialog->spin_scrollbox_lines,
_("Decide how many values should be shown at once in the scrollbox. "
@@ -1252,11 +1252,11 @@ create_scrollbox_page(xfceweather_dialog *dialog)
"theme's default."));
gtk_box_pack_start(GTK_BOX(hbox), dialog->button_scrollbox_font,
TRUE, TRUE, 0);
- if (dialog->wd->scrollbox_font)
+ if (dialog->pd->scrollbox_font)
gtk_button_set_label(GTK_BUTTON(dialog->button_scrollbox_font),
- dialog->wd->scrollbox_font);
+ dialog->pd->scrollbox_font);
dialog->button_scrollbox_color =
- gtk_color_button_new_with_color(&(dialog->wd->scrollbox_color));
+ gtk_color_button_new_with_color(&(dialog->pd->scrollbox_color));
gtk_size_group_add_widget(sg_misc, dialog->button_scrollbox_color);
SET_TOOLTIP
(dialog->button_scrollbox_color,
@@ -1336,9 +1336,9 @@ create_scrollbox_page(xfceweather_dialog *dialog)
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, FALSE, 0);
- if (dialog->wd->labels->len > 0) {
- for (i = 0; i < dialog->wd->labels->len; i++) {
- type = g_array_index(dialog->wd->labels, data_types, i);
+ if (dialog->pd->labels->len > 0) {
+ for (i = 0; i < dialog->pd->labels->len; i++) {
+ type = g_array_index(dialog->pd->labels, data_types, i);
if ((n = option_i(type)) != -1)
add_model_option(dialog->model_datatypes, n);
@@ -1349,7 +1349,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
(_("Animate _transitions between labels"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
(dialog->check_scrollbox_animate),
- dialog->wd->scrollbox_animate);
+ dialog->pd->scrollbox_animate);
SET_TOOLTIP(dialog->check_scrollbox_animate,
_("Scroll the current displayed value(s) out and the "
"new value(s) in instead of simply changing them. "
@@ -1429,14 +1429,14 @@ setup_notebook_signals(xfceweather_dialog *dialog)
xfceweather_dialog *
-create_config_dialog(xfceweather_data *data,
+create_config_dialog(plugin_data *data,
GtkWidget *vbox)
{
xfceweather_dialog *dialog;
GtkWidget *notebook;
dialog = g_slice_new0(xfceweather_dialog);
- dialog->wd = (xfceweather_data *) data;
+ dialog->pd = (plugin_data *) data;
dialog->dialog = gtk_widget_get_toplevel(vbox);
notebook = gtk_notebook_new();
@@ -1455,7 +1455,7 @@ create_config_dialog(xfceweather_data *data,
setup_notebook_signals(dialog);
/* automatically detect current location if it is yet unknown */
- if (!(dialog->wd->lat && dialog->wd->lon))
+ if (!(dialog->pd->lat && dialog->pd->lon))
start_auto_locate(dialog);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
diff --git a/panel-plugin/weather-config.h b/panel-plugin/weather-config.h
index c95e626..e4919f9 100644
--- a/panel-plugin/weather-config.h
+++ b/panel-plugin/weather-config.h
@@ -28,7 +28,7 @@ typedef struct {
typedef struct {
GtkWidget *dialog;
- xfceweather_data *wd;
+ plugin_data *pd;
guint timer_id;
/* location page */
@@ -67,7 +67,7 @@ typedef struct {
} xfceweather_dialog;
-xfceweather_dialog *create_config_dialog(xfceweather_data *data,
+xfceweather_dialog *create_config_dialog(plugin_data *data,
GtkWidget *vbox);
G_END_DECLS
diff --git a/panel-plugin/weather-debug.c b/panel-plugin/weather-debug.c
index 594352c..e879f8b 100644
--- a/panel-plugin/weather-debug.c
+++ b/panel-plugin/weather-debug.c
@@ -387,7 +387,7 @@ weather_dump_weatherdata(const xml_weather *wd)
g_string_append_printf(out, "%d timeslices available.\n",
wd->timeslices->len);
for (i = 0; i < wd->timeslices->len; i++) {
- timeslice = g_array_index(wd->timeslices, xml_time*, i);
+ timeslice = g_array_index(wd->timeslices, xml_time *, i);
tmp = weather_dump_timeslice(timeslice);
g_string_append_printf(out, " #%3d: %s", i + 1, tmp);
g_free(tmp);
@@ -405,7 +405,7 @@ weather_dump_weatherdata(const xml_weather *wd)
gchar *
-weather_dump_plugindata(const xfceweather_data *data)
+weather_dump_plugindata(const plugin_data *data)
{
GString *out;
GtkOrientation orientation, panel_orientation;
diff --git a/panel-plugin/weather-debug.h b/panel-plugin/weather-debug.h
index 727f6d0..3034b76 100644
--- a/panel-plugin/weather-debug.h
+++ b/panel-plugin/weather-debug.h
@@ -76,7 +76,7 @@ gchar *weather_dump_timeslice(const xml_time *timeslice);
gchar *weather_dump_weatherdata(const xml_weather *wd);
-gchar *weather_dump_plugindata(const xfceweather_data *data);
+gchar *weather_dump_plugindata(const plugin_data *data);
G_END_DECLS
diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
index 42dd45f..b365b3d 100644
--- a/panel-plugin/weather-parsers.c
+++ b/panel-plugin/weather-parsers.c
@@ -45,7 +45,7 @@
(xmlStrEqual(node->name, (const xmlChar *) type))
-extern debug_mode;
+extern gboolean debug_mode;
/*
@@ -81,7 +81,7 @@ get_timeslice(xml_weather *wd,
guint i;
for (i = 0; i < wd->timeslices->len; i++) {
- timeslice = g_array_index(wd->timeslices, xml_time*, i);
+ timeslice = g_array_index(wd->timeslices, xml_time *, i);
if (timeslice &&
timeslice->start == start_t && timeslice->end == end_t) {
if (index != NULL)
@@ -675,7 +675,7 @@ xml_weather_free(xml_weather *wd)
if (G_LIKELY(wd->timeslices)) {
weather_debug("Freeing %u timeslices.", wd->timeslices->len);
for (i = 0; i < wd->timeslices->len; i++) {
- timeslice = g_array_index(wd->timeslices, xml_time*, i);
+ timeslice = g_array_index(wd->timeslices, xml_time *, i);
xml_time_free(timeslice);
}
g_array_free(wd->timeslices, FALSE);
@@ -698,7 +698,7 @@ xml_weather_clean(xml_weather *wd)
if (G_UNLIKELY(wd == NULL || wd->timeslices == NULL))
return;
for (i = 0; i < wd->timeslices->len; i++) {
- timeslice = g_array_index(wd->timeslices, xml_time*, i);
+ timeslice = g_array_index(wd->timeslices, xml_time *, i);
if (G_UNLIKELY(timeslice == NULL))
continue;
if (difftime(now_t, timeslice->end) > DATA_EXPIRY_TIME) {
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index b916b29..637c537 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -251,7 +251,7 @@ logo_fetched(SoupSession *session,
static GtkWidget *
-weather_summary_get_logo(xfceweather_data *data)
+weather_summary_get_logo(plugin_data *data)
{
GtkWidget *image = gtk_image_new();
GdkPixbuf *pixbuf = NULL;
@@ -272,7 +272,7 @@ weather_summary_get_logo(xfceweather_data *data)
static GtkWidget *
-create_summary_tab(xfceweather_data *data)
+create_summary_tab(plugin_data *data)
{
GtkTextBuffer *buffer;
GtkTextIter iter;
@@ -553,7 +553,7 @@ add_forecast_header(const gchar *text,
static GtkWidget *
-add_forecast_cell(xfceweather_data *data,
+add_forecast_cell(plugin_data *data,
gint day,
gint daytime)
{
@@ -630,7 +630,7 @@ add_forecast_cell(xfceweather_data *data,
static GtkWidget *
-make_forecast(xfceweather_data *data)
+make_forecast(plugin_data *data)
{
GtkWidget *table, *ebox, *box, *align;
GtkWidget *forecast_box;
@@ -702,7 +702,7 @@ make_forecast(xfceweather_data *data)
static GtkWidget *
-create_forecast_tab(xfceweather_data *data)
+create_forecast_tab(plugin_data *data)
{
GtkWidget *ebox, *align, *hbox, *scrolled, *table;
GdkWindow *window;
@@ -786,7 +786,7 @@ summary_dialog_response(const GtkWidget *dlg,
GtkWidget *
-create_summary_window (xfceweather_data *data)
+create_summary_window(plugin_data *data)
{
GtkWidget *window, *notebook, *vbox, *hbox, *label;
gchar *title, *symbol;
diff --git a/panel-plugin/weather-summary.h b/panel-plugin/weather-summary.h
index 756eea3..585ba90 100644
--- a/panel-plugin/weather-summary.h
+++ b/panel-plugin/weather-summary.h
@@ -21,7 +21,7 @@
G_BEGIN_DECLS
-GtkWidget *create_summary_window(xfceweather_data *data);
+GtkWidget *create_summary_window(plugin_data *data);
void summary_details_free(summary_details *sum);
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 7d804c1..c77568f 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -71,7 +71,7 @@
gboolean debug_mode = FALSE;
static void
-write_cache_file(xfceweather_data *data);
+write_cache_file(plugin_data *data);
void
@@ -88,7 +88,7 @@ weather_http_queue_request(SoupSession *session,
static gchar *
-make_label(const xfceweather_data *data,
+make_label(const plugin_data *data,
data_types type)
{
xml_time *conditions;
@@ -194,7 +194,7 @@ get_cache_directory(void)
void
-update_icon(xfceweather_data *data)
+update_icon(plugin_data *data)
{
GdkPixbuf *icon = NULL;
xml_time *conditions;
@@ -222,7 +222,7 @@ update_icon(xfceweather_data *data)
void
-scrollbox_set_visible(xfceweather_data *data)
+scrollbox_set_visible(plugin_data *data)
{
if (data->show_scrollbox && data->labels->len > 0)
gtk_widget_show_all(GTK_WIDGET(data->vbox_center_scrollbox));
@@ -232,7 +232,7 @@ scrollbox_set_visible(xfceweather_data *data)
void
-update_scrollbox(xfceweather_data *data)
+update_scrollbox(plugin_data *data)
{
GString *out;
gchar *single = NULL;
@@ -279,7 +279,7 @@ update_scrollbox(xfceweather_data *data)
static void
-update_current_conditions(xfceweather_data *data)
+update_current_conditions(plugin_data *data)
{
struct tm now_tm;
@@ -318,7 +318,7 @@ cb_astro_update(SoupSession *session,
SoupMessage *msg,
gpointer user_data)
{
- xfceweather_data *data = user_data;
+ plugin_data *data = user_data;
xml_astro *astro;
if ((astro =
@@ -337,7 +337,7 @@ cb_weather_update(SoupSession *session,
SoupMessage *msg,
gpointer user_data)
{
- xfceweather_data *data = user_data;
+ plugin_data *data = user_data;
xmlDoc *doc;
xmlNode *root_node;
@@ -360,7 +360,7 @@ cb_weather_update(SoupSession *session,
static gboolean
-need_astro_update(const xfceweather_data *data)
+need_astro_update(const plugin_data *data)
{
time_t now_t;
struct tm now_tm, last_tm;
@@ -379,7 +379,7 @@ need_astro_update(const xfceweather_data *data)
static gboolean
-need_data_update(const xfceweather_data *data)
+need_data_update(const plugin_data *data)
{
time_t now_t;
gint diff;
@@ -397,7 +397,7 @@ need_data_update(const xfceweather_data *data)
static gboolean
-need_conditions_update(const xfceweather_data *data)
+need_conditions_update(const plugin_data *data)
{
time_t now_t;
struct tm now_tm;
@@ -413,7 +413,7 @@ need_conditions_update(const xfceweather_data *data)
static gboolean
-update_weatherdata(xfceweather_data *data)
+update_weatherdata(plugin_data *data)
{
gchar *url;
gboolean night_time;
@@ -502,7 +502,7 @@ labels_clear(GArray *array)
static void
xfceweather_read_config(XfcePanelPlugin *plugin,
- xfceweather_data *data)
+ plugin_data *data)
{
XfceRc *rc;
const gchar *value;
@@ -624,7 +624,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
static void
xfceweather_write_config(XfcePanelPlugin *plugin,
- xfceweather_data *data)
+ plugin_data *data)
{
gchar label[10];
guint i;
@@ -707,7 +707,7 @@ xfceweather_write_config(XfcePanelPlugin *plugin,
* Generate file name for the weather data cache file.
*/
static gchar *
-make_cache_filename(xfceweather_data *data)
+make_cache_filename(plugin_data *data)
{
gchar *cache_dir, *file;
@@ -742,7 +742,7 @@ cache_file_strftime_t(const time_t t)
static void
-write_cache_file(xfceweather_data *data)
+write_cache_file(plugin_data *data)
{
GString *out;
xml_weather *wd = data->weatherdata;
@@ -764,7 +764,7 @@ write_cache_file(xfceweather_data *data)
data->msl, data->timezone, wd->timeslices->len);
for (i = 0; i < wd->timeslices->len; i++) {
- timeslice = g_array_index(wd->timeslices, xml_time*, i);
+ timeslice = g_array_index(wd->timeslices, xml_time *, i);
if (G_UNLIKELY(timeslice == NULL || timeslice->location == NULL))
continue;
loc = timeslice->location;
@@ -814,7 +814,7 @@ write_cache_file(xfceweather_data *data)
void
-read_cache_file(xfceweather_data *data)
+read_cache_file(plugin_data *data)
{
GKeyFile *keyfile;
GError **err;
@@ -938,7 +938,7 @@ read_cache_file(xfceweather_data *data)
void
-update_weatherdata_with_reset(xfceweather_data *data, gboolean clear)
+update_weatherdata_with_reset(plugin_data *data, gboolean clear)
{
if (data->updatetimeout)
g_source_remove(data->updatetimeout);
@@ -967,7 +967,7 @@ static void
close_summary(GtkWidget *widget,
gpointer *user_data)
{
- xfceweather_data *data = (xfceweather_data *) user_data;
+ plugin_data *data = (plugin_data *) user_data;
if (data->summary_details)
summary_details_free(data->summary_details);
@@ -980,7 +980,7 @@ void
forecast_click(GtkWidget *widget,
gpointer user_data)
{
- xfceweather_data *data = (xfceweather_data *) user_data;
+ plugin_data *data = (plugin_data *) user_data;
if (data->summary_window != NULL)
gtk_widget_destroy(data->summary_window);
@@ -998,7 +998,7 @@ cb_click(GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- xfceweather_data *data = (xfceweather_data *) user_data;
+ plugin_data *data = (plugin_data *) user_data;
if (event->button == 1)
forecast_click(widget, user_data);
@@ -1014,7 +1014,7 @@ cb_scroll(GtkWidget *widget,
GdkEventScroll *event,
gpointer user_data)
{
- xfceweather_data *data = (xfceweather_data *) user_data;
+ plugin_data *data = (plugin_data *) user_data;
if (event->direction == GDK_SCROLL_UP ||
event->direction == GDK_SCROLL_DOWN)
@@ -1028,7 +1028,7 @@ static void
mi_click(GtkWidget *widget,
gpointer user_data)
{
- xfceweather_data *data = (xfceweather_data *) user_data;
+ plugin_data *data = (plugin_data *) user_data;
update_weatherdata_with_reset(data, FALSE);
}
@@ -1039,7 +1039,7 @@ xfceweather_dialog_response(GtkWidget *dlg,
gint response,
xfceweather_dialog *dialog)
{
- xfceweather_data *data = (xfceweather_data *) dialog->wd;
+ plugin_data *data = (plugin_data *) dialog->pd;
icon_theme *theme;
gboolean result;
guint i;
@@ -1057,7 +1057,7 @@ xfceweather_dialog_response(GtkWidget *dlg,
gtk_widget_destroy(dlg);
gtk_list_store_clear(dialog->model_datatypes);
for (i = 0; i < dialog->icon_themes->len; i++) {
- theme = g_array_index(dialog->icon_themes, icon_theme*, i);
+ theme = g_array_index(dialog->icon_themes, icon_theme *, i);
icon_theme_free(theme);
g_array_free(dialog->icon_themes, TRUE);
}
@@ -1074,7 +1074,7 @@ xfceweather_dialog_response(GtkWidget *dlg,
static void
xfceweather_create_options(XfcePanelPlugin *plugin,
- xfceweather_data *data)
+ plugin_data *data)
{
GtkWidget *dlg, *vbox;
xfceweather_dialog *dialog;
@@ -1106,7 +1106,7 @@ xfceweather_create_options(XfcePanelPlugin *plugin,
static gchar *
-weather_get_tooltip_text(const xfceweather_data *data)
+weather_get_tooltip_text(const plugin_data *data)
{
xml_time *conditions;
struct tm *point_tm, *start_tm, *end_tm, *sunrise_tm, *sunset_tm;
@@ -1246,7 +1246,7 @@ weather_get_tooltip_cb(GtkWidget *widget,
gint y,
gboolean keyboard_mode,
GtkTooltip *tooltip,
- xfceweather_data *data)
+ plugin_data *data)
{
GdkPixbuf *icon;
xml_time *conditions;
@@ -1281,10 +1281,10 @@ weather_get_tooltip_cb(GtkWidget *widget,
}
-static xfceweather_data *
+static plugin_data *
xfceweather_create_control(XfcePanelPlugin *plugin)
{
- xfceweather_data *data = g_slice_new0(xfceweather_data);
+ plugin_data *data = g_slice_new0(plugin_data);
SoupMessage *msg;
SoupURI *soup_proxy_uri;
const gchar *proxy_uri;
@@ -1402,7 +1402,7 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
static void
xfceweather_free(XfcePanelPlugin *plugin,
- xfceweather_data *data)
+ plugin_data *data)
{
weather_debug("Freeing plugin data.");
g_assert(data != NULL);
@@ -1435,7 +1435,7 @@ xfceweather_free(XfcePanelPlugin *plugin,
/* free icon theme */
icon_theme_free(data->icon_theme);
- g_slice_free(xfceweather_data, data);
+ g_slice_free(plugin_data, data);
data = NULL;
}
@@ -1443,7 +1443,7 @@ xfceweather_free(XfcePanelPlugin *plugin,
static gboolean
xfceweather_set_size(XfcePanelPlugin *panel,
gint size,
- xfceweather_data *data)
+ plugin_data *data)
{
data->panel_size = size;
#if LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
@@ -1465,7 +1465,7 @@ xfceweather_set_size(XfcePanelPlugin *panel,
static gboolean
xfceweather_set_mode(XfcePanelPlugin *panel,
XfcePanelPluginMode mode,
- xfceweather_data *data)
+ plugin_data *data)
{
GtkWidget *parent = gtk_widget_get_parent(data->vbox_center_scrollbox);
@@ -1508,7 +1508,7 @@ xfceweather_set_mode(XfcePanelPlugin *panel,
static gboolean
xfceweather_set_orientation(XfcePanelPlugin *panel,
GtkOrientation orientation,
- xfceweather_data *data)
+ plugin_data *data)
{
GtkWidget *parent = gtk_widget_get_parent(data->vbox_center_scrollbox);
@@ -1542,7 +1542,7 @@ xfceweather_set_orientation(XfcePanelPlugin *panel,
static void
xfceweather_show_about(XfcePanelPlugin *plugin,
- xfceweather_data *data)
+ plugin_data *data)
{
GdkPixbuf *icon;
const gchar *auth[] = {
@@ -1575,7 +1575,7 @@ xfceweather_show_about(XfcePanelPlugin *plugin,
static void
weather_construct(XfcePanelPlugin *plugin)
{
- xfceweather_data *data;
+ plugin_data *data;
const gchar *panel_debug_env;
/* Enable debug level logging if PANEL_DEBUG contains G_LOG_DOMAIN */
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index 1ce7f7c..3bb82c3 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -96,7 +96,7 @@ typedef struct {
forecast_layouts forecast_layout;
gint forecast_days;
gboolean round;
-} xfceweather_data;
+} plugin_data;
extern gboolean debug_mode;
@@ -106,20 +106,20 @@ void weather_http_queue_request(SoupSession *session,
SoupSessionCallback callback_func,
gpointer user_data);
-void scrollbox_set_visible(xfceweather_data *data);
+void scrollbox_set_visible(plugin_data *data);
void forecast_click(GtkWidget *widget,
gpointer user_data);
gchar *get_cache_directory(void);
-void read_cache_file(xfceweather_data *data);
+void read_cache_file(plugin_data *data);
-void update_icon(xfceweather_data *data);
+void update_icon(plugin_data *data);
-void update_scrollbox(xfceweather_data *data);
+void update_scrollbox(plugin_data *data);
-void update_weatherdata_with_reset(xfceweather_data *data,
+void update_weatherdata_with_reset(plugin_data *data,
gboolean clear);
GArray *labels_clear(GArray *array);
More information about the Xfce4-commits
mailing list