Attachment #203584 for bug #230478

View | Details | Raw Unified | Return to bug 230478
Collapse All | Expand All

Lines 1-5 Link Here

(-)a/ChangeLog (+10 lines)
1	2007-12-19 Federico Mena Quintero <federico@novell.com>	1	2007-12-19 Federico Mena Quintero <federico@novell.com>
2		2
		3	* main-menu/src/tile-table.c (tile_table_new): Don't reload the
		4	table here. This prevents unnecessary loading at startup...
		5
		6	* main-menu/src/main-menu-ui.c (select_page): ... but rather
		7	reload them here when selecting a page.
		8	(main_menu_ui_new): Reload the sys_table here, at startup.
		9	(apply_lockdown_settings): And don't reload all the tables here.
		10
		11	2007-12-19 Federico Mena Quintero <federico@novell.com>
		12
3	* main-menu/src/main-menu-ui.c (select_page): Take in a	13	* main-menu/src/main-menu-ui.c (select_page): Take in a
4	"set_page_selector_button" argument, to decide whether we set the	14	"set_page_selector_button" argument, to decide whether we set the
5	correct button here as well. Also, set the notebook page. This	15	correct button here as well. Also, set the notebook page. This

Lines 294-299 main_menu_ui_new (PanelApplet *applet) Link Here

(-)a/main-menu/src/main-menu-ui.c (-6 / +21 lines)
294		294
295	bind_beagle_search_key (this);	295	bind_beagle_search_key (this);
296	update_limits (this);	296	update_limits (this);
		297
		298	tile_table_reload (priv->sys_table);
297	select_page (this, TRUE);	299	select_page (this, TRUE);
298	apply_lockdown_settings (this);	300	apply_lockdown_settings (this);
299		301
Lines 1128-1133 select_page (MainMenuUI *this, gboolean set_page_selector_button) Link Here
1128	}	1130	}
1129		1131
1130	gtk_notebook_set_current_page (priv->file_section, priv->notebook_page_ids [curr_page]);	1132	gtk_notebook_set_current_page (priv->file_section, priv->notebook_page_ids [curr_page]);
		1133
		1134	switch (curr_page) {
		1135	case APPS_PAGE:
		1136	tile_table_reload (priv->file_tables[USER_APPS_TABLE]);
		1137	tile_table_reload (priv->file_tables[RCNT_APPS_TABLE]);
		1138	break;
		1139
		1140	case DOCS_PAGE:
		1141	tile_table_reload (priv->file_tables[USER_DOCS_TABLE]);
		1142	tile_table_reload (priv->file_tables[RCNT_DOCS_TABLE]);
		1143	break;
		1144
		1145	case DIRS_PAGE:
		1146	tile_table_reload (priv->file_tables[USER_DIRS_TABLE]);
		1147	break;
		1148
		1149	default:
		1150	g_assert_not_reached ();
		1151	}
1131	}	1152	}
1132		1153
1133	static void	1154	static void
Lines 1514-1525 apply_lockdown_settings (MainMenuUI *this) Link Here
1514	for (i = 0; i < 5; ++i)	1535	for (i = 0; i < 5; ++i)
1515	set_table_section_visible (this, priv->file_tables [i]);	1536	set_table_section_visible (this, priv->file_tables [i]);
1516		1537
1517	tile_table_reload (priv->sys_table);
1518	tile_table_reload (priv->file_tables [USER_APPS_TABLE]);
1519	tile_table_reload (priv->file_tables [RCNT_APPS_TABLE]);
1520	tile_table_reload (priv->file_tables [USER_DOCS_TABLE]);
1521	tile_table_reload (priv->file_tables [USER_DIRS_TABLE]);
1522
1523	update_limits (this);	1538	update_limits (this);
1524	}	1539	}
1525		1540

Lines 101-108 tile_table_new (BookmarkAgent *agent, gint limit, gint n_cols, Link Here

(-)a/main-menu/src/tile-table.c (-3 lines)
101	priv->create_item_func = uti_func;	101	priv->create_item_func = uti_func;
102	priv->item_func_data = data_uti;	102	priv->item_func_data = data_uti;
103		103
104	tile_table_reload (TILE_TABLE (this));
105
106	g_signal_connect (	104	g_signal_connect (
107	G_OBJECT (priv->agent), "notify::" BOOKMARK_AGENT_ITEMS_PROP,	105	G_OBJECT (priv->agent), "notify::" BOOKMARK_AGENT_ITEMS_PROP,
108	G_CALLBACK (agent_notify_cb), this);	106	G_CALLBACK (agent_notify_cb), this);
109	-

Return to bug 230478