started proper implementation of icon size selection: hackish and dirty at the moment

[simple-launcher] / simple-launcher.cc

diff --git a/simple-launcher.cc b/simple-launcher.cc
index 92657a8..c3bfd8e 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -135,7 +135,7 @@ char *SimpleLauncherApplet::ourDirs[] = {
 };
 
 // SimpleLauncherApplet::SimpleLauncherApplet() : myMainSettings(myClient.getKey(SL_APPLET_GCONF_PATH)), myContext(NULL), myWidget(NULL), myParent(NULL) {
-SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", true), myIconSize(base, "icon_size", 48) {
+SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", true), myIconSize(base, "icon_size", 26) {
 }
 
 bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
@@ -155,12 +155,13 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
 
 SimpleLauncherApplet::~SimpleLauncherApplet() {
   myItems.clear();
-
+#if 0
+  // This does not seem to be necessary
   if (myWidget != NULL) {
     gtk_widget_destroy(myWidget);
     myWidget = NULL;
   }
-
+#endif
   if (myContext != NULL) {
     osso_deinitialize(myContext);
     myContext = NULL;
@@ -202,7 +203,7 @@ void SimpleLauncherApplet::loadConfig() {
       addItem(myItems, buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
     }
 
-    delete buffer;
+    delete [] buffer;
   }
 }
 
@@ -370,7 +371,7 @@ void SimpleLauncherApplet::runDialog() {
       ;     // FIXME: do I want to do anything in here?
   }
 
-  newItems.clear();
+  // newItems.clear(); // TODO: do I really need it?
 }
 
 // vim:ts=2:sw=2:et