X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=simple-launcher.cc;h=93de8fbe507743f15ba188a3e988722db246b900;hb=0de0b3f293aa4afe6b2d2a7d1969cf035b68695d;hp=4a6c4c4d2c5162b792cb01587ddc81685793e1f5;hpb=846b3b7116c68a1af4ddd39de7a0dcf5a1be35c8;p=simple-launcher

diff --git a/simple-launcher.cc b/simple-launcher.cc
index 4a6c4c4..93de8fb 100644
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -139,8 +139,6 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
     return false;
   }
 
-  gtk_widget_show_all(myWidget);
-
   return true;
 }
 
@@ -174,6 +172,7 @@ void SimpleLauncherApplet::addItem(LauncherItems& items, const std::string& name
   }
 }
 
+// FIXME: this probably should be done somehow differently
 static char *configFileName="/home/user/.slarc";
 
 void SimpleLauncherApplet::loadConfig() {
@@ -190,7 +189,6 @@ void SimpleLauncherApplet::loadConfig() {
       }
 
       addItem(myItems, buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
-
     }
 
     delete buffer;
@@ -278,10 +276,16 @@ void SimpleLauncherApplet::updateWidget() {
 
   if (button_no) {
     gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar));
-    gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    if (button_no == 0) {
+      gtk_widget_set_size_request(myWidget, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    } else {
+      gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    }
   } else {
     gtk_widget_destroy(GTK_WIDGET(toolbar));
   }
+
+  gtk_widget_show_all(myWidget);
 }
 
 void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
@@ -311,10 +315,6 @@ int SimpleLauncherApplet::saveState(void **state_data, int *state_size) {
 }
 
 GtkWidget *SimpleLauncherApplet::settings(GtkWindow *parent) {
-  // TODO: in case we want SimpleLauncherApplet to be configurable, this method
-  // should return a gtk_menu_item that would be included in home settings
-  // menu.  Method should make sure that when we activate that item, a
-  // corresponding dialog appears.
   myParent = parent;  // FIXME: Ugly piece of code :(
 
   GtkWidget *menuItem = gtk_menu_item_new_with_label("Launcher settings...");