remove unneccesary alternative build dependency

[simple-launcher] / simple-launcher.cc

diff --git a/simple-launcher.cc b/simple-launcher.cc
index 3218fc7..0044068 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -35,21 +35,6 @@
 
 #define SL_APPLET_GCONF_PATH  "/apps/simple-launcher"
 
-// A copy of interface functions from hildon-home-plugin-interface (new hildon desktop does not have it) {{{
-
-extern "C" {
-
-  void *hildon_home_applet_lib_initialize(void *state_data, int *state_size, GtkWidget **widget);
-  int hildon_home_applet_lib_save_state(void *applet_data, void **state_data, int *state_size);
-  void hildon_home_applet_lib_background(void *applet_data);
-  void hildon_home_applet_lib_foreground(void *applet_data);
-  void hildon_home_applet_lib_deinitialize(void *applet_data);
-  GtkWidget *hildon_home_applet_lib_settings(void *applet_data, GtkWindow *parent);
-
-};
-
-// }}}
-
 class SimpleLauncherApplet {
 public:
   SimpleLauncherApplet(const GConfKey&);
@@ -57,8 +42,6 @@ public:
 
   bool doInit(void *state_data, int *state_size);
 
-  void background() {}
-  void foreground() {}
   int saveState(void **state_data, int *state_size);
   GtkWidget *settings(GtkWindow *parent);
 
@@ -125,14 +108,6 @@ void hildon_home_applet_lib_deinitialize(void *applet_data) {
   delete applet;
 }
 
-void hildon_home_applet_lib_background(void *applet_data) {
-  ((SimpleLauncherApplet *)applet_data)->background();
-}
-
-void hildon_home_applet_lib_foreground (void *applet_data) {
-  ((SimpleLauncherApplet *)applet_data)->foreground();
-}
-
 GtkWidget *hildon_home_applet_lib_settings(void *applet_data, GtkWindow *parent) {
   return ((SimpleLauncherApplet *)applet_data)->settings(parent);
 }
@@ -149,7 +124,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", 26) {
+SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", false), myIconSize(base, "icon_size", 48) {
 }
 
 bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
@@ -198,6 +173,7 @@ void SimpleLauncherApplet::addItem(LauncherItems& items, const std::string& name
   }
 }
 
+// {{{ Configuration file managment
 static const gchar *getConfigFileName() {
   static gchar *configFileName = NULL;
 
@@ -239,6 +215,8 @@ void SimpleLauncherApplet::saveConfig() {
   }
 }
 
+// }}}
+
 void SimpleLauncherApplet::updateItems(LauncherItems& items) {
   for (int i = 0 ; ourDirs[i] != NULL ; ++i) {
     processDirectory(items, ourDirs[i]);
@@ -270,7 +248,7 @@ void SimpleLauncherApplet::processDirectory(LauncherItems& items, const std::str
 }
 
 bool SimpleLauncherApplet::initWidget() {
-  myWidget = gtk_hbox_new(false, 2);
+  myWidget = gtk_hbox_new(false, 0);
 
   if (myWidget != NULL) {
     updateWidget();