soylent r95 - trunk/src
- From: treitter svn gnome org
- To: svn-commits-list gnome org
- Subject: soylent r95 - trunk/src
- Date: Sat, 8 Mar 2008 06:48:35 +0000 (GMT)
Author: treitter
Date: Sat Mar 8 06:48:34 2008
New Revision: 95
URL: http://svn.gnome.org/viewvc/soylent?rev=95&view=rev
Log:
make the new utility functions static; give commit_detail_add() a better name
Modified:
trunk/src/soylent-browser-person-view.c
trunk/src/soylent-browser-person-view.h
trunk/src/soylent-browser.c
Modified: trunk/src/soylent-browser-person-view.c
==============================================================================
--- trunk/src/soylent-browser-person-view.c (original)
+++ trunk/src/soylent-browser-person-view.c Sat Mar 8 06:48:34 2008
@@ -76,6 +76,12 @@
gpointer handler);
static void entry_set_text_block_handler (GtkEntry *entry, const gchar *text,
gpointer handler);
+static gchar* soylent_browser_person_detail_add_get_cbox_val
+ (SoylentBrowser *browser,
+ const gchar *cbox_name);
+static gchar* soylent_browser_person_detail_add_get_web_attr_name
+ (SoylentBrowser *browser);
+
/* Adding individual details to the VCard/EContact */
static gboolean detail_add_person_add_attr (SoylentBrowser *browser,
@@ -643,80 +649,12 @@
return retval;
}
-/* Return an uppercased copy of the contents of the given GtkComboBox or NULL
- * for any failure. */
-gchar*
-soylent_browser_detail_add_get_cbox_val (SoylentBrowser *browser,
- const gchar *cbox_name)
-{
- gchar *retval = NULL;
- gchar *retval_lc = NULL;
- GladeXML *wtree = NULL;
- GtkComboBox *cbox = NULL;
-
- g_return_val_if_fail (browser != NULL, retval);
- /* FIXME: uncomment once SoylentBrowser is a GObject:
- g_return_val_if_fail (SOYLENT_IS_BROWSER (user_data), NULL);
- */
- g_return_val_if_fail (cbox_name != NULL, retval);
-
- wtree = soylent_browser_get_widget_tree (browser);
- cbox = GTK_COMBO_BOX (glade_xml_get_widget (wtree, cbox_name));
- retval_lc = gtk_combo_box_get_active_text (cbox);
- retval = g_ascii_strup (retval_lc, -1);
-
- g_free (retval_lc);
-
- return retval;
-}
-
-/* Return a copy of the VCard name for the active Detail Add:Web GtkComboBox or
- * NULL for any failure. */
-gchar*
-soylent_browser_detail_add_get_web_attr_name (SoylentBrowser *browser)
-{
- const gchar *menu_strs[] = {"Home Page", "Blog", "Calendar", "Video Phone",
- NULL,};
- const gchar *attr_strs[] = {EVC_URL, EVC_X_BLOG_URL, EVC_CALURI,
- EVC_X_VIDEO_URL, NULL,};
-
- gchar *retval = NULL;
- GladeXML *wtree = NULL;
- GtkComboBox *cbox = NULL;
- gchar *attr_val_menu = NULL;
- guint i;
-
- g_return_val_if_fail (browser != NULL, retval);
- /* FIXME: uncomment once SoylentBrowser is a GObject:
- g_return_val_if_fail (SOYLENT_IS_BROWSER (browser), NULL);
- */
-
- wtree = soylent_browser_get_widget_tree (browser);
- cbox = GTK_COMBO_BOX (glade_xml_get_widget (wtree, "cbox_detail_type_web"));
- attr_val_menu = gtk_combo_box_get_active_text (cbox);
- for (i = 0; menu_strs[i] != NULL; i++)
- {
- if (g_str_equal (attr_val_menu, menu_strs[i]))
- {
- retval = g_strdup (attr_strs[i]);
- }
- }
-
- if (!retval)
- {
- g_warning ("Didn't find a supported VCard attr. name in menu");
- }
-
- g_free (attr_val_menu);
-
- return retval;
-}
-
/* Commit any new details to the person being edited
*
* Return TRUE for success, FALSE for any failure. */
gboolean
-commit_detail_add (GtkWidget *btn_detail_add, gpointer user_data)
+soylent_browser_person_detail_add_commit (GtkWidget *btn_detail_add,
+ gpointer user_data)
{
gboolean retval = FALSE;
SoylentBrowser *browser = NULL;
@@ -747,17 +685,20 @@
if (g_str_equal (domain, "Email"))
{
attr_name = g_strdup (EVC_EMAIL);
- param_val = soylent_browser_detail_add_get_cbox_val (browser,
+ param_val = soylent_browser_person_detail_add_get_cbox_val
+ (browser,
"cbox_detail_type");
}
else if (g_str_equal (domain, "Instant Messaging"))
{
gchar *proto = NULL;
- proto = soylent_browser_detail_add_get_cbox_val (browser,
- "cbox_detail_proto");
+ proto = soylent_browser_person_detail_add_get_cbox_val
+ (browser,
+ "cbox_detail_proto");
attr_name = g_strdup_printf ("X-%s", proto);
- param_val = soylent_browser_detail_add_get_cbox_val (browser,
+ param_val = soylent_browser_person_detail_add_get_cbox_val
+ (browser,
"cbox_detail_type");
g_free (proto);
@@ -765,18 +706,19 @@
else if (g_str_equal (domain, "Phone"))
{
attr_name = g_strdup (EVC_TEL);
- param_val = soylent_browser_detail_add_get_cbox_val
+ param_val = soylent_browser_person_detail_add_get_cbox_val
(browser,
"cbox_detail_type_phone");
}
else if (g_str_equal (domain, "Web Address"))
{
- attr_name = soylent_browser_detail_add_get_web_attr_name (browser);
+ attr_name = soylent_browser_person_detail_add_get_web_attr_name (browser);
}
else if (g_str_equal (domain, "Mailing Address"))
{
/* TODO: set the corresponding LABEL attribute that Evolution sets */
- param_val = soylent_browser_detail_add_get_cbox_val (browser,
+ param_val = soylent_browser_person_detail_add_get_cbox_val
+ (browser,
"cbox_detail_type");
attr_name = g_strdup (EVC_ADR);
}
@@ -2779,3 +2721,72 @@
gtk_widget_show (GTK_WIDGET (frame_web));
}
}
+
+/* Return an uppercased copy of the contents of the given GtkComboBox or NULL
+ * for any failure. */
+static gchar*
+soylent_browser_person_detail_add_get_cbox_val (SoylentBrowser *browser,
+ const gchar *cbox_name)
+{
+ gchar *retval = NULL;
+ gchar *retval_lc = NULL;
+ GladeXML *wtree = NULL;
+ GtkComboBox *cbox = NULL;
+
+ g_return_val_if_fail (browser != NULL, retval);
+ /* FIXME: uncomment once SoylentBrowser is a GObject:
+ g_return_val_if_fail (SOYLENT_IS_BROWSER (user_data), NULL);
+ */
+ g_return_val_if_fail (cbox_name != NULL, retval);
+
+ wtree = soylent_browser_get_widget_tree (browser);
+ cbox = GTK_COMBO_BOX (glade_xml_get_widget (wtree, cbox_name));
+ retval_lc = gtk_combo_box_get_active_text (cbox);
+ retval = g_ascii_strup (retval_lc, -1);
+
+ g_free (retval_lc);
+
+ return retval;
+}
+
+/* Return a copy of the VCard name for the active Detail Add:Web GtkComboBox or
+ * NULL for any failure. */
+static gchar*
+soylent_browser_person_detail_add_get_web_attr_name (SoylentBrowser *browser)
+{
+ const gchar *menu_strs[] = {"Home Page", "Blog", "Calendar", "Video Phone",
+ NULL,};
+ const gchar *attr_strs[] = {EVC_URL, EVC_X_BLOG_URL, EVC_CALURI,
+ EVC_X_VIDEO_URL, NULL,};
+
+ gchar *retval = NULL;
+ GladeXML *wtree = NULL;
+ GtkComboBox *cbox = NULL;
+ gchar *attr_val_menu = NULL;
+ guint i;
+
+ g_return_val_if_fail (browser != NULL, retval);
+ /* FIXME: uncomment once SoylentBrowser is a GObject:
+ g_return_val_if_fail (SOYLENT_IS_BROWSER (browser), NULL);
+ */
+
+ wtree = soylent_browser_get_widget_tree (browser);
+ cbox = GTK_COMBO_BOX (glade_xml_get_widget (wtree, "cbox_detail_type_web"));
+ attr_val_menu = gtk_combo_box_get_active_text (cbox);
+ for (i = 0; menu_strs[i] != NULL; i++)
+ {
+ if (g_str_equal (attr_val_menu, menu_strs[i]))
+ {
+ retval = g_strdup (attr_strs[i]);
+ }
+ }
+
+ if (!retval)
+ {
+ g_warning ("Didn't find a supported VCard attr. name in menu");
+ }
+
+ g_free (attr_val_menu);
+
+ return retval;
+}
Modified: trunk/src/soylent-browser-person-view.h
==============================================================================
--- trunk/src/soylent-browser-person-view.h (original)
+++ trunk/src/soylent-browser-person-view.h Sat Mar 8 06:48:34 2008
@@ -42,11 +42,11 @@
gboolean soylent_browser_person_action_delete_selected_cb (GtkButton *btn,
gpointer user_data);
gboolean soylent_browser_person_action_delete_selected_finalize_cb
- (GtkButton *btn,
- gpointer user_data);
+ (GtkButton *btn,
+ gpointer user_data);
gboolean soylent_browser_person_action_delete_selected_hide_dialog_cb
- (GtkButton *btn,
- gpointer user_data);
+ (GtkButton *btn,
+ gpointer user_data);
int soylent_browser_person_action_edit_selected_cb (GtkButton *btn,
gpointer user_data);
gboolean soylent_browser_person_action_chat_menu_tool_button_cb
@@ -64,13 +64,11 @@
(SoylentBrowser *browser,
SoylentPerson *person);
-gboolean entry_changed_e_contact (GtkEditable *editable, gpointer user_data);
+gboolean entry_changed_e_contact (GtkEditable *editable, gpointer user_data);
/* Committing changes from the above functions */
-gchar* soylent_browser_detail_add_get_cbox_val (SoylentBrowser *browser,
- const gchar *cbox_name);
-gchar* soylent_browser_detail_add_get_web_attr_name (SoylentBrowser *browser);
-gboolean commit_detail_add (GtkWidget *widget, gpointer user_data);
+gboolean soylent_browser_person_detail_add_commit (GtkWidget *btn_detail_add,
+ gpointer user_data);
/* Setup/update sections of the person view UI with latest data from e-d-s */
void btn_detail_add_update (GtkWidget *widget, gpointer user_data);
Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c (original)
+++ trunk/src/soylent-browser.c Sat Mar 8 06:48:34 2008
@@ -1570,7 +1570,8 @@
browser},
{"entry_detail_add", "changed", btn_detail_add_update, CB_DATA_SIMPLE,
browser},
- {"btn_detail_add", "clicked", commit_detail_add, CB_DATA_SIMPLE, browser},
+ {"btn_detail_add", "clicked", soylent_browser_person_detail_add_commit,
+ CB_DATA_SIMPLE, browser},
/* postal mail */
{"tv_person_mail_add_street", "changed", btn_detail_add_update,
CB_DATA_SIMPLE, browser},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]