[Goodies-commits] r4899 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2008-06-07 16:24:58 +0000 (Sat, 07 Jun 2008)
New Revision: 4899

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/cfg.c
Log:
Revert "Make label insensitive when not shown".

This label is used for the tooltip also.


Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2008-06-06 17:49:46 UTC (rev 4898)
+++ xfce4-places-plugin/trunk/ChangeLog	2008-06-07 16:24:58 UTC (rev 4899)
@@ -1,3 +1,8 @@
+2008-06-07	Diego Ongaro <ongardie at gmail.com>
+
+	* cfg.c: Revert "Make label insensitive when not shown" (this
+	label is used for the tooltip also)
+
 2008-05-01	Diego Ongaro <ongardie at gmail.com>
 
 	* cfg.c: Make label insensitive when not shown

Modified: xfce4-places-plugin/trunk/panel-plugin/cfg.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/cfg.c	2008-06-06 17:49:46 UTC (rev 4898)
+++ xfce4-places-plugin/trunk/panel-plugin/cfg.c	2008-06-07 16:24:58 UTC (rev 4899)
@@ -169,7 +169,6 @@
 static void
 pcfg_button_show_cb(GtkComboBox *combo, PlacesCfg *cfg)
 {
-    GtkWidget *transient;
     gint option = gtk_combo_box_get_active(combo);
 
     g_assert(cfg != NULL);
@@ -178,10 +177,6 @@
     cfg->show_button_icon  = (option == 0 || option == 2);
     cfg->show_button_label = (option == 1 || option == 2);
 
-    transient = g_object_get_data(G_OBJECT(combo), "cfg_transient");
-    if(transient != NULL)
-        gtk_widget_set_sensitive(transient, cfg->show_button_label);
-
     places_view_cfg_iface_update_button(cfg->view_iface);
 }
 
@@ -385,10 +380,6 @@
 
     /* BUTTON: Label text entry */
     tmp_box = gtk_hbox_new(FALSE, 15);
-    
-    gtk_widget_set_sensitive(tmp_box, cfg->show_button_label);
-    g_object_set_data(G_OBJECT(tmp_widget), "cfg_transient", tmp_box);
-
     gtk_widget_show(tmp_box);
     gtk_box_pack_start(GTK_BOX(vbox_button), tmp_box, FALSE, FALSE, 0);