X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=cb4aa9ba1aa93ba180666f25f9646a1388d7805e;hb=0fcdb76da25111d74fdbd6df0be3c9b4f45fc4bc;hp=fd85fed0e531fe7e94cfae90b2effa9f94979bdc;hpb=18daca5ab3402c2c3f8ae44df5cec89928d35afe;p=chaz%2Ftint2

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index fd85fed..cb4aa9b 100644
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -34,6 +34,7 @@
 
 int launcher_enabled;
 int launcher_max_icon_size;
+int launcher_tooltip_enabled;
 int launcher_alpha;
 int launcher_saturation;
 int launcher_brightness;
@@ -55,6 +56,7 @@ void default_launcher()
 {
 	launcher_enabled = 0;
 	launcher_max_icon_size = 0;
+	launcher_tooltip_enabled = 0;
 	launcher_alpha = 100;
 	launcher_saturation = 0;
 	launcher_brightness = 0;
@@ -102,6 +104,7 @@ void init_launcher_panel(void *p)
 void cleanup_launcher()
 {
 	int i;
+	GSList *l;
 
 	if (xsettings_client)
 		xsettings_client_destroy(xsettings_client);
@@ -109,15 +112,14 @@ void cleanup_launcher()
 		Panel *panel = &panel1[i];
 		Launcher *launcher = &panel->launcher;		
 		cleanup_launcher_theme(launcher);
-		
-		GSList *l;
-		for (l = launcher->list_apps; l ; l = l->next) {
-			free(l->data);
-		}
-		g_slist_free(launcher->list_apps);
-		launcher->list_apps = NULL;
 	}
-	g_free(icon_theme_name);
+	for (l = panel_config.launcher.list_apps; l ; l = l->next) {
+		free(l->data);
+	}
+	g_slist_free(panel_config.launcher.list_apps);
+	panel_config.launcher.list_apps = NULL;
+	free(icon_theme_name);
+	icon_theme_name = 0;
 	launcher_enabled = 0;
 }
 
@@ -694,7 +696,10 @@ void launcher_load_icons(Launcher *launcher)
 			launcherIcon->area.bg = &g_array_index(backgrounds, Background, 0);
 			launcherIcon->area.on_screen = 1;
 			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
-			launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+			if (launcher_tooltip_enabled) 
+				launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+			else
+				launcherIcon->area._get_tooltip_text = NULL;
 			launcherIcon->is_app_desktop = 1;
 			launcherIcon->cmd = strdup(entry.exec);
 			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(ICON_FALLBACK);