Commit 1c9f4830 authored by Scott Reeves's avatar Scott Reeves

Fix for BNC#283186

svn path=/trunk/; revision=370
parent c0315d29
2007-11-28 Scott Reeves <sreeves@novell.com>
* libslab/app-shell-startup.c
* libslab/app-shell.c:
Patch from Magnus Boman for double draw on show - BNC#283186
2007-11-05 Scott Reeves <sreeves@novell.com> 2007-11-05 Scott Reeves <sreeves@novell.com>
* main-menu/src/main-menu-ui.c: * main-menu/src/main-menu-ui.c:
Don't show lock screen option when logged in as root - BNC136622 Don't show lock screen option when logged in as root - BNC136622
......
...@@ -44,7 +44,6 @@ apss_new_instance_cb (BonoboApplication * app, gint argc, char *argv[], gpointer ...@@ -44,7 +44,6 @@ apss_new_instance_cb (BonoboApplication * app, gint argc, char *argv[], gpointer
g_object_get (app_data->main_gnome_app, "visible", &visible, NULL); g_object_get (app_data->main_gnome_app, "visible", &visible, NULL);
if (!visible) if (!visible)
{ {
nld_search_bar_set_text (search_bar, "", TRUE);
show_shell (app_data); show_shell (app_data);
} }
......
...@@ -65,6 +65,7 @@ static gboolean main_keypress_callback (GtkWidget * widget, GdkEventKey * event, ...@@ -65,6 +65,7 @@ static gboolean main_keypress_callback (GtkWidget * widget, GdkEventKey * event,
AppShellData * app_data); AppShellData * app_data);
static gboolean main_delete_callback (GtkWidget * widget, GdkEvent * event, static gboolean main_delete_callback (GtkWidget * widget, GdkEvent * event,
AppShellData * app_data); AppShellData * app_data);
static void application_launcher_clear_search_bar (AppShellData * app_data);
static void launch_selected_app (AppShellData * app_data); static void launch_selected_app (AppShellData * app_data);
static void generate_potential_apps (gpointer catdata, gpointer user_data); static void generate_potential_apps (gpointer catdata, gpointer user_data);
...@@ -94,6 +95,8 @@ hide_shell (AppShellData * app_data) ...@@ -94,6 +95,8 @@ hide_shell (AppShellData * app_data)
gtk_window_get_position (GTK_WINDOW (app_data->main_gnome_app), gtk_window_get_position (GTK_WINDOW (app_data->main_gnome_app),
&app_data->main_gnome_app_window_x, &app_data->main_gnome_app_window_y); &app_data->main_gnome_app_window_x, &app_data->main_gnome_app_window_y);
/* printf("x:%d, y:%d\n", app_data->main_gnome_app_window_x, app_data->main_gnome_app_window_y); */ /* printf("x:%d, y:%d\n", app_data->main_gnome_app_window_x, app_data->main_gnome_app_window_y); */
/* clear the search bar now so reshowing is fast and flicker free - BNC#283186 */
application_launcher_clear_search_bar (app_data);
gtk_widget_hide (app_data->main_gnome_app); gtk_widget_hide (app_data->main_gnome_app);
} }
...@@ -1291,6 +1294,16 @@ application_launcher_compare (gconstpointer a, gconstpointer b) ...@@ -1291,6 +1294,16 @@ application_launcher_compare (gconstpointer a, gconstpointer b)
return g_ascii_strcasecmp (val1, val2); return g_ascii_strcasecmp (val1, val2);
} }
static void
application_launcher_clear_search_bar (AppShellData * app_data)
{
SlabSection *section = SLAB_SECTION (app_data->filter_section);
NldSearchBar *search_bar;
g_assert (NLD_IS_SEARCH_BAR (section->contents));
search_bar = NLD_SEARCH_BAR (section->contents);
nld_search_bar_set_text (search_bar, "", TRUE);
}
/* /*
static gint static gint
category_name_compare (gconstpointer a, gconstpointer b) category_name_compare (gconstpointer a, gconstpointer b)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment