This is an automated email from the git hooks/post-receive script.
T o Z p u s h e d a c o m m i t
t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-genmon-plugin.
commit 659f16d8648fe2d90120570f3b6e53835ecbfe8d
Author: ToZ <tony.pau...@gmail.com>
Date: Sat Apr 4 13:20:46 2020 -0400
Fix font display when cancelled
---
panel-plugin/main.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index e68527d..d41f094 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -50,6 +50,7 @@ typedef struct param_t {
char *acTitle;
uint32_t iPeriod_ms;
char *acFont;
+ char *acFonttmp;
} param_t;
typedef struct conf_t {
@@ -516,6 +517,7 @@ static void genmon_free (XfcePanelPlugin *plugin, genmon_t
*poPlugin)
g_free (poPlugin->oConf.oParam.acCmd);
g_free (poPlugin->oConf.oParam.acTitle);
g_free (poPlugin->oConf.oParam.acFont);
+ g_free (poPlugin->oConf.oParam.acFonttmp);
g_free (poPlugin->oMonitor.onClickCmd);
g_free (poPlugin->acValue);
g_free (poPlugin);
@@ -818,9 +820,9 @@ static void ChooseFont (GtkWidget *p_wPB, void *p_pvPlugin)
if (iResponse == GTK_RESPONSE_OK) {
pcFont = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (wDialog));
if (pcFont) {
- g_free (poConf->acFont);
- poConf->acFont = g_strdup (pcFont);
- gtk_button_set_label (GTK_BUTTON (p_wPB), poConf->acFont);
+ g_free (poConf->acFonttmp);
+ poConf->acFonttmp = g_strdup (pcFont);
+ gtk_button_set_label (GTK_BUTTON (p_wPB), poConf->acFonttmp);
}
}
gtk_widget_destroy (wDialog);
@@ -831,7 +833,14 @@ static void ChooseFont (GtkWidget *p_wPB, void *p_pvPlugin)
static void genmon_dialog_response (GtkWidget *dlg, int response,
genmon_t *genmon)
{
+ struct param_t *poConf = &(genmon->oConf.oParam);
+
if (response == GTK_RESPONSE_OK) {
+ if (poConf->acFonttmp)
+ {
+ g_free (poConf->acFont);
+ poConf->acFont = g_strdup (poConf->acFonttmp);
+ }
UpdateConf (genmon);
genmon_write_config (genmon->plugin, genmon);
/* Do not wait the next timer to update display */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
