[Galago-commits] r2630 - in trunk/libgalago-gtk: . libgalago-gtk
tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Fri Mar 24 14:06:19 PST 2006
Author: chipx86
Date: 2006-03-24 14:06:09 -0800 (Fri, 24 Mar 2006)
New Revision: 2630
Modified:
trunk/libgalago-gtk/ChangeLog
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.h
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-label.h
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.c
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.h
trunk/libgalago-gtk/tests/test-presence-icon.c
Log:
Renamed the galago_gtk_{account,service}_combo_box_{get,set}_active() functions to galago_gtk_account_combo_box_{get,set}_account() and galago_gtk_service_combo_box_{get,set}_service().
Modified: trunk/libgalago-gtk/ChangeLog
===================================================================
--- trunk/libgalago-gtk/ChangeLog 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/ChangeLog 2006-03-24 22:06:09 UTC (rev 2630)
@@ -1,3 +1,15 @@
+Fri Mar 24 14:04:58 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * libgalago-gtk/galago-gtk-account-combo-box.c:
+ * libgalago-gtk/galago-gtk-account-combo-box.h:
+ * libgalago-gtk/galago-gtk-account-label.h:
+ * libgalago-gtk/galago-gtk-service-combo-box.c:
+ * libgalago-gtk/galago-gtk-service-combo-box.h:
+ * tests/test-presence-icon.c:
+ - Renamed the galago_gtk_{account,service}_combo_box_{get,set}_active()
+ functions to galago_gtk_account_combo_box_{get,set}_account() and
+ galago_gtk_service_combo_box_{get,set}_service().
+
Fri Mar 17 01:39:07 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* libgalago-gtk/galago-gtk-account-label.h:
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c 2006-03-24 22:06:09 UTC (rev 2630)
@@ -139,7 +139,7 @@
{
GalagoAccount *account;
- account = galago_gtk_account_combo_box_get_active(combobox);
+ account = galago_gtk_account_combo_box_get_account(combobox);
g_signal_emit(combobox, signals[ACCOUNT_CHANGED], 0, account);
}
@@ -366,7 +366,7 @@
if (combobox->priv->service != NULL && service != combobox->priv->service)
return TRUE;
- cur_account = galago_gtk_account_combo_box_get_active(combobox);
+ cur_account = galago_gtk_account_combo_box_get_account(combobox);
rebuild_list(combobox);
@@ -377,8 +377,8 @@
GALAGO_TYPE_SERVICE) &&
cur_account == account))
{
- if (galago_gtk_account_combo_box_get_active(combobox) != cur_account)
- galago_gtk_account_combo_box_set_active(combobox, cur_account);
+ if (galago_gtk_account_combo_box_get_account(combobox) != cur_account)
+ galago_gtk_account_combo_box_set_account(combobox, cur_account);
}
else
{
@@ -539,8 +539,8 @@
}
void
-galago_gtk_account_combo_box_set_active(GalagoGtkAccountComboBox *combobox,
- const GalagoAccount *account)
+galago_gtk_account_combo_box_set_account(GalagoGtkAccountComboBox *combobox,
+ const GalagoAccount *account)
{
GtkTreeModel *model;
GtkTreeIter iter;
@@ -568,7 +568,7 @@
}
GalagoAccount *
-galago_gtk_account_combo_box_get_active(
+galago_gtk_account_combo_box_get_account(
const GalagoGtkAccountComboBox *combobox)
{
GalagoAccount *account = NULL;
@@ -595,7 +595,7 @@
GalagoService *service, GalagoGtkAccountComboBox *combobox)
{
galago_gtk_account_combo_box_set_service(combobox,
- galago_gtk_service_combo_box_get_active(service_combobox));
+ galago_gtk_service_combo_box_get_service(service_combobox));
}
static void
@@ -640,7 +640,7 @@
G_CALLBACK(service_combo_box_destroyed_cb),
combobox);
- service = galago_gtk_service_combo_box_get_active(
+ service = galago_gtk_service_combo_box_get_service(
GALAGO_GTK_SERVICE_COMBO_BOX(service_combobox));
}
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.h 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.h 2006-03-24 22:06:09 UTC (rev 2630)
@@ -84,9 +84,9 @@
GalagoService *galago_gtk_account_combo_box_get_service(
const GalagoGtkAccountComboBox *combobox);
-void galago_gtk_account_combo_box_set_active(
+void galago_gtk_account_combo_box_set_account(
GalagoGtkAccountComboBox *combobox, const GalagoAccount *account);
-GalagoAccount *galago_gtk_account_combo_box_get_active(
+GalagoAccount *galago_gtk_account_combo_box_get_account(
const GalagoGtkAccountComboBox *combobox);
void galago_gtk_account_combo_box_set_services_combo_box(
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-label.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-label.h 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-label.h 2006-03-24 22:06:09 UTC (rev 2630)
@@ -70,11 +70,8 @@
void galago_gtk_account_label_set_account(GalagoGtkAccountLabel *label,
GalagoAccount *account);
-void galago_gtk_account_label_set_person(GalagoGtkAccountLabel *label,
- GalagoPerson *person);
GalagoAccount *galago_gtk_account_label_get_account(const GalagoGtkAccountLabel *label);
-GalagoPerson *galago_gtk_account_label_get_person(const GalagoGtkAccountLabel *label);
G_END_DECLS
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.c 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.c 2006-03-24 22:06:09 UTC (rev 2630)
@@ -117,7 +117,7 @@
{
GalagoService *service;
- service = galago_gtk_service_combo_box_get_active(combobox);
+ service = galago_gtk_service_combo_box_get_service(combobox);
g_signal_emit(combobox, signals[SERVICE_CHANGED], 0, service);
}
@@ -243,14 +243,14 @@
{
GalagoService *cur_service;
- cur_service = galago_gtk_service_combo_box_get_active(combobox);
+ cur_service = galago_gtk_service_combo_box_get_service(combobox);
rebuild_list(combobox);
if (cur_service != NULL)
{
- if (galago_gtk_service_combo_box_get_active(combobox) != cur_service)
- galago_gtk_service_combo_box_set_active(combobox, cur_service);
+ if (galago_gtk_service_combo_box_get_service(combobox) != cur_service)
+ galago_gtk_service_combo_box_set_service(combobox, cur_service);
}
else
gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
@@ -262,14 +262,14 @@
{
GalagoService *cur_service;
- cur_service = galago_gtk_service_combo_box_get_active(combobox);
+ cur_service = galago_gtk_service_combo_box_get_service(combobox);
rebuild_list(combobox);
if (cur_service == service)
{
- if (galago_gtk_service_combo_box_get_active(combobox) != cur_service)
- galago_gtk_service_combo_box_set_active(combobox, cur_service);
+ if (galago_gtk_service_combo_box_get_service(combobox) != cur_service)
+ galago_gtk_service_combo_box_set_service(combobox, cur_service);
}
else
gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
@@ -290,8 +290,8 @@
}
void
-galago_gtk_service_combo_box_set_active(GalagoGtkServiceComboBox *combobox,
- const GalagoService *service)
+galago_gtk_service_combo_box_set_service(GalagoGtkServiceComboBox *combobox,
+ const GalagoService *service)
{
GtkTreeModel *model;
GtkTreeIter iter;
@@ -319,7 +319,7 @@
}
GalagoService *
-galago_gtk_service_combo_box_get_active(
+galago_gtk_service_combo_box_get_service(
const GalagoGtkServiceComboBox *combobox)
{
GalagoService *service = NULL;
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.h 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.h 2006-03-24 22:06:09 UTC (rev 2630)
@@ -73,9 +73,9 @@
GtkWidget *galago_gtk_service_combo_box_new(void);
-void galago_gtk_service_combo_box_set_active(GalagoGtkServiceComboBox *combobox,
- const GalagoService *service);
-GalagoService *galago_gtk_service_combo_box_get_active(
+void galago_gtk_service_combo_box_set_service(
+ GalagoGtkServiceComboBox *combobox, const GalagoService *service);
+GalagoService *galago_gtk_service_combo_box_get_service(
const GalagoGtkServiceComboBox *combobox);
G_END_DECLS
Modified: trunk/libgalago-gtk/tests/test-presence-icon.c
===================================================================
--- trunk/libgalago-gtk/tests/test-presence-icon.c 2006-03-24 10:07:45 UTC (rev 2629)
+++ trunk/libgalago-gtk/tests/test-presence-icon.c 2006-03-24 22:06:09 UTC (rev 2630)
@@ -40,9 +40,9 @@
GalagoAccount *account, *contact;
const char *user;
- service = galago_gtk_service_combo_box_get_active(
+ service = galago_gtk_service_combo_box_get_service(
GALAGO_GTK_SERVICE_COMBO_BOX(service_list));
- account = galago_gtk_account_combo_box_get_active(
+ account = galago_gtk_account_combo_box_get_account(
GALAGO_GTK_ACCOUNT_COMBO_BOX(account_list));
user = gtk_entry_get_text(GTK_ENTRY(user_entry));
More information about the galago-commits
mailing list