[Goodies-commits] r3691 - in xfce4-places-plugin/trunk: . panel-plugin
Diego Ongaro
ongardie at xfce.org
Mon Dec 10 09:03:22 CET 2007
Author: ongardie
Date: 2007-12-10 08:03:22 +0000 (Mon, 10 Dec 2007)
New Revision: 3691
Modified:
xfce4-places-plugin/trunk/ChangeLog
xfce4-places-plugin/trunk/TODO
xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-12-10 Diego Ongaro <ongardie at gmail.com>
* view.c: Bug: label didn't change when already shown
Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog 2007-12-10 06:56:47 UTC (rev 3690)
+++ xfce4-places-plugin/trunk/ChangeLog 2007-12-10 08:03:22 UTC (rev 3691)
@@ -1,3 +1,7 @@
+2007-12-10 Diego Ongaro <ongardie at gmail.com>
+
+ * view.c: Bug: label didn't change when already shown
+
2007-12-09 Diego Ongaro <ongardie at gmail.com>
* *: Improve compatibility with older versions of libs
Modified: xfce4-places-plugin/trunk/TODO
===================================================================
--- xfce4-places-plugin/trunk/TODO 2007-12-10 06:56:47 UTC (rev 3690)
+++ xfce4-places-plugin/trunk/TODO 2007-12-10 08:03:22 UTC (rev 3691)
@@ -2,4 +2,3 @@
path/uri mess
new tooltip API in GTK 2.12
error messages and notifications for (un)mounting
-label doesn't change when already shown
Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c 2007-12-10 06:56:47 UTC (rev 3690)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c 2007-12-10 08:03:22 UTC (rev 3691)
@@ -89,7 +89,7 @@
gint size;
gboolean show_button_icon;
gboolean show_button_label;
- gchar *label_tooltip_text;
+ gchar *label_text;
gboolean force_update_theme;
/* model */
@@ -745,7 +745,7 @@
PlacesCfg *cfg = view->cfg;
gboolean orientation_changed, size_changed,
icon_presence_changed, label_presence_changed,
- label_tooltip_changed, theme_changed;
+ label_changed, theme_changed;
static gboolean first_run = TRUE;
DBG("button_update (first run: %1x)", first_run);
@@ -765,8 +765,8 @@
label_presence_changed = TRUE;
view->show_button_label = cfg->show_button_label;
- label_tooltip_changed = TRUE;
- view->label_tooltip_text = g_strdup(cfg->label);
+ label_changed = TRUE;
+ view->label_text = g_strdup(cfg->label);
theme_changed = TRUE;
view->force_update_theme = FALSE;
@@ -776,14 +776,14 @@
size_changed = (view->size != xfce_panel_plugin_get_size(view->plugin));
icon_presence_changed = (view->show_button_icon != cfg->show_button_icon);
label_presence_changed = (view->show_button_label != cfg->show_button_label);
- label_tooltip_changed = (strcmp(view->label_tooltip_text, cfg->label) != 0);
+ label_changed = (strcmp(view->label_text, cfg->label) != 0);
theme_changed = view->force_update_theme;
}
- DBG("orientation: %1x, size: %1x, icon_pr: %1x, label_pr: %1x, label_tooltip: %1x",
+ DBG("orientation: %1x, size: %1x, icon_pr: %1x, label_pr: %1x, label_text: %1x",
orientation_changed, size_changed,
icon_presence_changed, label_presence_changed,
- label_tooltip_changed);
+ label_changed);
if(orientation_changed){
GtkWidget *button_box = gtk_bin_get_child(GTK_BIN(view->button));
@@ -794,15 +794,15 @@
size_changed = TRUE;
}
- if(label_tooltip_changed){
- g_free(view->label_tooltip_text);
- view->label_tooltip_text = g_strdup(cfg->label);
+ if(label_changed){
+ g_free(view->label_text);
+ view->label_text = g_strdup(cfg->label);
}
if(theme_changed)
view->force_update_theme = FALSE;
- if(size_changed || icon_presence_changed || label_presence_changed || theme_changed){
+ if(size_changed || icon_presence_changed || label_presence_changed || label_changed || theme_changed){
view->size = xfce_panel_plugin_get_size(view->plugin);
DBG("Panel size: %d", view->size);
view->show_button_icon = cfg->show_button_icon;
@@ -852,14 +852,14 @@
GtkRequisition req;
if(view->button_label == NULL){
- view->button_label = g_object_ref(gtk_label_new(cfg->label));
+ view->button_label = g_object_ref(gtk_label_new(view->label_text));
gtk_box_pack_end_defaults(GTK_BOX(button_box),
view->button_label);
gtk_widget_show(view->button_label);
}else{
g_assert(GTK_IS_WIDGET(view->button_label));
- if(label_tooltip_changed)
- gtk_label_set_text(GTK_LABEL(view->button_label), view->label_tooltip_text);
+ if(label_changed)
+ gtk_label_set_text(GTK_LABEL(view->button_label), view->label_text);
}
gtk_widget_size_request(view->button_label, &req);
@@ -902,8 +902,8 @@
gtk_widget_set_size_request(view->button, width, height);
}
- if(label_tooltip_changed)
- gtk_tooltips_set_tip(view->tooltips, view->button, view->label_tooltip_text, NULL);
+ if(label_changed)
+ gtk_tooltips_set_tip(view->tooltips, view->button, view->label_text, NULL);
}
static void
@@ -1077,8 +1077,8 @@
g_object_unref(view->button_label);
if(view->button != NULL)
g_object_unref(view->button);
- if(view->label_tooltip_text != NULL)
- g_free(view->label_tooltip_text);
+ if(view->label_text != NULL)
+ g_free(view->label_text);
g_object_unref(view->tooltips);
places_cfg_view_iface_finalize(view->cfg_iface);
More information about the Goodies-commits
mailing list