aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-09-23 05:03:28 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-23 05:03:28 +0800
commit73c370019c4de89d4c901ee8c25cc0cbb55992fb (patch)
tree26609470a1148d3bd364cbce5d5ab2f41e0e23d4 /e-util
parent6b2295c93a40f6010d94399666a8e099aded8e85 (diff)
downloadgsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar.gz
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar.bz2
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar.lz
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar.xz
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.tar.zst
gsoc2013-evolution-73c370019c4de89d4c901ee8c25cc0cbb55992fb.zip
Search UI is kinda sorta working. Still some outstanding issues.
svn path=/branches/kill-bonobo/; revision=36427
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-util.c11
-rw-r--r--e-util/e-util.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c
index cec2ec1b69..0055407068 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -107,10 +107,10 @@ e_display_help (GtkWindow *parent,
/**
* e_load_ui_definition:
- * @manager: a #GtkUIManager
+ * @ui_manager: a #GtkUIManager
* @basename: basename of the UI definition file
*
- * Loads a UI definition into @manager from Evolution's UI directory.
+ * Loads a UI definition into @ui_manager from Evolution's UI directory.
* Failure here is fatal, since the application can't function without
* its UI definitions.
*
@@ -118,18 +118,19 @@ e_display_help (GtkWindow *parent,
* unmerge the UI with gtk_ui_manager_remove_ui().
**/
guint
-e_load_ui_definition (GtkUIManager *manager,
+e_load_ui_definition (GtkUIManager *ui_manager,
const gchar *basename)
{
gchar *filename;
guint merge_id;
GError *error = NULL;
- g_return_val_if_fail (GTK_IS_UI_MANAGER (manager), 0);
+ g_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), 0);
g_return_val_if_fail (basename != NULL, 0);
filename = g_build_filename (EVOLUTION_UIDIR, basename, NULL);
- merge_id = gtk_ui_manager_add_ui_from_file (manager, filename, &error);
+ merge_id = gtk_ui_manager_add_ui_from_file (
+ ui_manager, filename, &error);
g_free (filename);
if (error != NULL)
diff --git a/e-util/e-util.h b/e-util/e-util.h
index d1a76c8ea6..a6aaa19a99 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -44,7 +44,7 @@ typedef enum {
const gchar * e_get_user_data_dir (void);
void e_display_help (GtkWindow *parent,
const gchar *link_id);
-guint e_load_ui_definition (GtkUIManager *manager,
+guint e_load_ui_definition (GtkUIManager *ui_manager,
const gchar *basename);
char * e_str_without_underscores (const char *s);