aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog5
-rw-r--r--widgets/misc/e-charset-picker.c6
-rw-r--r--widgets/misc/e-charset-picker.h3
3 files changed, 11 insertions, 3 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index de675bf776..3f00ca133a 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Now
+ takes a menu path argument.
+
2001-10-04 Rodrigo Moya <rodrigo@ximian.com>
* Makefile.am: added BONOBO_GNOME_CFLAGS to make it compile with
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 2ce6291e2c..b1d49943e2 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -359,6 +359,7 @@ e_charset_picker_dialog (const char *title, const char *prompt,
/**
* e_charset_picker_bonobo_ui_populate:
* @uic: Bonobo UI Component
+ * @path: menu path
* @default_charset: the default character set, or %NULL to use the
* locale character set.
* @cb: Callback function
@@ -373,7 +374,8 @@ e_charset_picker_dialog (const char *title, const char *prompt,
* sets.
**/
void
-e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *default_charset,
+e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path,
+ const char *default_charset,
BonoboUIListenerFn cb, gpointer user_data)
{
char *locale_charset, *encoded_label, *label;
@@ -459,6 +461,6 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *default
g_string_append (menuitems, "</submenu>\n");
- bonobo_ui_component_set (uic, "/menu/Edit", menuitems->str, NULL);
+ bonobo_ui_component_set (uic, path, menuitems->str, NULL);
g_string_free (menuitems, TRUE);
}
diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h
index 352c09baee..821d98615d 100644
--- a/widgets/misc/e-charset-picker.h
+++ b/widgets/misc/e-charset-picker.h
@@ -38,7 +38,8 @@ char *e_charset_picker_dialog (const char *title, const char *prompt,
GtkWindow *parent);
/* bonobo equivalents */
-void e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *default_charset,
+void e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path,
+ const char *default_charset,
BonoboUIListenerFn cb, gpointer user_data);
#ifdef __cplusplus