[Xfce4-commits] <xfce4-indicator-plugin:master> some random fixes

[Mark Trompell]

Updating branch refs/heads/master
         to 9ef5c622e92f64d61bb246b9924a6dc0805774c2 (commit)
       from 3df674322c3a59d3084b5442da45ef78664165dd (commit)

commit 9ef5c622e92f64d61bb246b9924a6dc0805774c2
Author: Mark Trompell <mark at foresightlinux.org>
Date:   Tue Jun 2 12:05:52 2009 +0200

    some random fixes

 panel-plugin/indicator.c |   10 +++-------
 panel-plugin/indicator.h |    2 --
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index d7e632b..e570677 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -182,12 +182,11 @@ indicator_new (XfcePanelPlugin *plugin)
     /* A label to allow for click through */
     indicator->item = gtk_label_new(_("No Indicators"));
     gtk_widget_show(indicator->item);
-    gtk_container_add (GTK_CONTAINER (indicator->ebox), indicator->item);
+    gtk_container_add (GTK_CONTAINER (plugin), indicator->item);
   } else {
-    gtk_container_add (GTK_CONTAINER (indicator->ebox), indicator->menubar);
     gtk_widget_show(indicator->menubar);
+    gtk_container_add (GTK_CONTAINER (plugin), indicator->menubar);
   }
-  gtk_widget_show(indicator->ebox);
   return indicator;
 }
 
@@ -204,9 +203,6 @@ indicator_free (XfcePanelPlugin *plugin,
   if (G_UNLIKELY (dialog != NULL))
     gtk_widget_destroy (dialog);
 
-  /* destroy the panel widgets */
-  gtk_widget_destroy (indicator->hvbox);
-
   /* cleanup the settings */
   if (G_LIKELY (indicator->setting1 != NULL))
     g_free (indicator->setting1);
@@ -223,7 +219,7 @@ indicator_orientation_changed (XfcePanelPlugin *plugin,
                             IndicatorPlugin    *indicator)
 {
   /* change the orienation of the box */
-  xfce_hvbox_set_orientation (XFCE_HVBOX (indicator->hvbox), orientation);
+  //xfce_hvbox_set_orientation (XFCE_HVBOX (indicator->hvbox), orientation);
 }
 
 
diff --git a/panel-plugin/indicator.h b/panel-plugin/indicator.h
index c2c8127..4399823 100644
--- a/panel-plugin/indicator.h
+++ b/panel-plugin/indicator.h
@@ -28,9 +28,7 @@ typedef struct
     XfcePanelPlugin *plugin;
 
     /* panel widgets */
-    GtkWidget       *ebox;
     GtkWidget       *menubar;
-    GtkWidget       *hvbox;
     GtkWidget       *label;    
     GdkPixbuf       *item;