[Galago-commits] r2604 - in trunk/libgalago-gtk: . libgalago-gtk
tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Thu Mar 16 23:27:20 PST 2006
Author: chipx86
Date: 2006-03-16 23:27:16 -0800 (Thu, 16 Mar 2006)
New Revision: 2604
Removed:
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.h
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.c
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.h
Modified:
trunk/libgalago-gtk/ChangeLog
trunk/libgalago-gtk/configure.ac
trunk/libgalago-gtk/libgalago-gtk/Makefile.am
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-entry-completion.c
trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.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/libgalago-gtk/galago-gtk.h
trunk/libgalago-gtk/tests/test-presence-icon.c
Log:
No more living in the ancient times. Require gtk+ 2.4.0 or higher, and ditch the old 2.2-specific widgets.
Modified: trunk/libgalago-gtk/ChangeLog
===================================================================
--- trunk/libgalago-gtk/ChangeLog 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/ChangeLog 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,3 +1,22 @@
+Thu Mar 16 23:26:45 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ D libgalago-gtk/galago-gtk-account-option-menu.c:
+ D libgalago-gtk/galago-gtk-account-option-menu.h:
+ D libgalago-gtk/galago-gtk-service-option-menu.c:
+ D libgalago-gtk/galago-gtk-service-option-menu.h:
+ * libgalago-gtk/galago-gtk-account-combo-box.c:
+ * libgalago-gtk/galago-gtk-account-combo-box.h:
+ * libgalago-gtk/galago-gtk-entry-completion.c:
+ * libgalago-gtk/galago-gtk-entry-completion.h:
+ * libgalago-gtk/galago-gtk.h:
+ * libgalago-gtk/galago-gtk-service-combo-box.c:
+ * libgalago-gtk/galago-gtk-service-combo-box.h:
+ * libgalago-gtk/Makefile.am:
+ * tests/test-presence-icon.c:
+ * configure.ac:
+ - No more living in the ancient times. Require gtk+ 2.4.0 or higher,
+ and ditch the old 2.2-specific widgets.
+
Thu Mar 16 23:21:23 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* libgalago-gtk/galago-gtk.h:
Modified: trunk/libgalago-gtk/configure.ac
===================================================================
--- trunk/libgalago-gtk/configure.ac 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/configure.ac 2006-03-17 07:27:16 UTC (rev 2604)
@@ -3,7 +3,7 @@
dnl ################################################################
dnl # Initialize autoconf
dnl ################################################################
-AC_INIT(libgalago-gtk, 0.3.4, chipx86 at chipx86.com)
+AC_INIT(libgalago-gtk, 0.3.4.90, chipx86 at chipx86.com)
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(config.h.in)
AC_COPYRIGHT([Copyright 2004-2005 Christian Hammond])
@@ -15,7 +15,7 @@
LIBGALAGO_GTK_MAJOR_VERSION=0
LIBGALAGO_GTK_MINOR_VERSION=3
LIBGALAGO_GTK_MICRO_VERSION=4
-LIBGALAGO_GTK_DEVEL_VERSION=0
+LIBGALAGO_GTK_DEVEL_VERSION=90
LIBGALAGO_GTK_VERSION=$LIBGALAGO_GTK_MAJOR_VERSION.$LIBGALAGO_GTK_MINOR_VERSION.$LIBGALAGO_GTK_MICRO_VERSION
@@ -91,7 +91,7 @@
AM_GNU_GETTEXT_VERSION(0.10.40)
AM_GNU_GETTEXT
-pkg_modules="glib-2.0 >= 2.2.0, gtk+-2.0 >= 2.2.0, libgalago >= 0.3.2, dbus-1 >= 0.23, dbus-glib-1 >= 0.23"
+pkg_modules="glib-2.0 >= 2.4.0, gtk+-2.0 >= 2.4.0, libgalago >= 0.3.3.90, dbus-1 >= 0.36, dbus-glib-1 >= 0.36"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -134,4 +134,3 @@
echo "Now type make to compile"
echo "Then su to root and type: make install"
echo
-
Modified: trunk/libgalago-gtk/libgalago-gtk/Makefile.am
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/Makefile.am 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/Makefile.am 2006-03-17 07:27:16 UTC (rev 2604)
@@ -12,7 +12,6 @@
galago-gtk-account-combo-box.h \
galago-gtk-account-label.h \
galago-gtk-account-menu-item.h \
- galago-gtk-account-option-menu.h \
galago-gtk-contact-chooser.h \
galago-gtk-contact-chooser-dialog.h \
galago-gtk-contact-chooser-widget.h \
@@ -26,7 +25,6 @@
galago-gtk-service-combo-box.h \
galago-gtk-service-list.h \
galago-gtk-service-menu-item.h \
- galago-gtk-service-option-menu.h \
galago-gtk-tooltips.h \
galago-gtk-types.h
@@ -43,7 +41,6 @@
galago-gtk-account-combo-box.c \
galago-gtk-account-label.c \
galago-gtk-account-menu-item.c \
- galago-gtk-account-option-menu.c \
galago-gtk-contact-chooser.c \
galago-gtk-contact-chooser-dialog.c \
galago-gtk-contact-chooser-widget.c \
@@ -59,7 +56,6 @@
galago-gtk-service-combo-box.c \
galago-gtk-service-list.c \
galago-gtk-service-menu-item.c \
- galago-gtk-service-option-menu.c \
galago-gtk-stock.c \
galago-gtk-stock.h \
galago-gtk-tooltips.c \
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-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -24,8 +24,6 @@
#include <libgalago/galago.h>
#include <string.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
struct _GalagoGtkAccountComboBoxPriv
{
GalagoPerson *person;
@@ -658,5 +656,3 @@
return combobox->priv->service_combobox;
}
-
-#endif /* GTK_CHECK_VERSION(2,4,0) */
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-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-combo-box.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -23,8 +23,6 @@
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
typedef struct _GalagoGtkAccountComboBox GalagoGtkAccountComboBox;
typedef struct _GalagoGtkAccountComboBoxClass GalagoGtkAccountComboBoxClass;
typedef struct _GalagoGtkAccountComboBoxPriv GalagoGtkAccountComboBoxPriv;
@@ -98,6 +96,4 @@
G_END_DECLS
-#endif /* GTK_CHECK_VERSION(2,4,0) */
-
#endif /* _GALAGO_GTK_ACCOUNT_COMBO_BOX_H_ */
Deleted: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,577 +0,0 @@
-/**
- * @file libgalago-gtk/galago-gtk-account-option-menu.c
- * Account OptionMenu widget
- *
- * @Copyright (C) 2004-2005 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include <libgalago-gtk/galago-gtk-account-option-menu.h>
-#include <libgalago-gtk/galago-gtk-account-menu-item.h>
-#include <libgalago-gtk/galago-gdk-pixbuf.h>
-#include <libgalago-gtk/galago-gtk-private.h>
-#include <libgalago/galago.h>
-#include <string.h>
-
-struct _GalagoGtkAccountOptionMenuPriv
-{
- GalagoPerson *person;
- GalagoService *service;
-
- gboolean me_person_set;
- gboolean me_accounts;
-
- gboolean rebuilding_list;
-
- GtkWidget *service_optmenu;
-
- gint service_changed_id;
- gint service_optmenu_destroyed_id;
-
- gulong account_added_id;
- gulong account_removed_id;
- gulong account_conn_state_changed_id;
-
- gulong person_added_id;
- gulong person_destroy_id;
-};
-
-enum
-{
- ACCOUNT_CHANGED,
- LAST_SIGNAL
-};
-
-enum
-{
- COLUMN_DATA,
- COLUMN_ICON,
- COLUMN_NAME,
- NUM_COLUMNS
-};
-
-static void galago_gtk_account_option_menu_class_init(
- GalagoGtkAccountOptionMenuClass *klass);
-static void galago_gtk_account_option_menu_init(
- GalagoGtkAccountOptionMenu *optmenu);
-static void galago_gtk_account_option_menu_finalize(GObject *obj);
-static void galago_gtk_account_option_menu_destroy(GtkObject *obj);
-static gboolean account_added_removed_cb(GSignalInvocationHint *ihint,
- guint n_param_values,
- const GValue *param_values,
- gpointer data);
-static void person_destroy_cb(GalagoPerson *person,
- GalagoGtkAccountOptionMenu *optmenu);
-
-static GtkOptionMenuClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = {0};
-
-GType
-galago_gtk_account_option_menu_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo info =
- {
- sizeof(GalagoGtkAccountOptionMenuClass),
- NULL,
- NULL,
- (GClassInitFunc)galago_gtk_account_option_menu_class_init,
- NULL,
- NULL,
- sizeof(GalagoGtkAccountOptionMenu),
- 0,
- (GInstanceInitFunc)galago_gtk_account_option_menu_init
- };
-
- type = g_type_register_static(GTK_TYPE_OPTION_MENU,
- "GalagoGtkAccountOptionMenu", &info, 0);
- }
-
- return type;
-}
-
-static void
-galago_gtk_account_option_menu_class_init(
- GalagoGtkAccountOptionMenuClass *klass)
-{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
-
- parent_class = g_type_class_peek_parent(klass);
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = GTK_OBJECT_CLASS(klass);
-
- gobject_class->finalize = galago_gtk_account_option_menu_finalize;
-
- object_class->destroy = galago_gtk_account_option_menu_destroy;
-
- signals[ACCOUNT_CHANGED] =
- g_signal_new("account_changed",
- G_TYPE_FROM_CLASS(gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(GalagoGtkAccountOptionMenuClass,
- account_changed),
- NULL, NULL,
- gtk_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
-}
-
-static void
-option_menu_changed(GalagoGtkAccountOptionMenu *optmenu, gpointer user_data)
-{
- GalagoAccount *account;
-
- account = galago_gtk_account_option_menu_get_active(optmenu);
-
- g_signal_emit(optmenu, signals[ACCOUNT_CHANGED], 0, account);
-}
-
-static void
-galago_gtk_account_option_menu_init(GalagoGtkAccountOptionMenu *optmenu)
-{
- optmenu->priv = g_new0(GalagoGtkAccountOptionMenuPriv, 1);
-
- g_signal_connect(G_OBJECT(optmenu), "changed",
- G_CALLBACK(option_menu_changed), NULL);
-
- /*
- * Ensure that we have these types loaded first, or glib will yell at us.
- */
- g_type_class_ref(GALAGO_TYPE_SERVICE);
-
- optmenu->priv->account_added_id =
- g_signal_add_emission_hook(g_signal_lookup("account-added",
- GALAGO_TYPE_SERVICE),
- 0, account_added_removed_cb, optmenu, NULL);
- optmenu->priv->account_removed_id =
- g_signal_add_emission_hook(g_signal_lookup("account-removed",
- GALAGO_TYPE_SERVICE),
- 0, account_added_removed_cb, optmenu, NULL);
-}
-
-static void
-galago_gtk_account_option_menu_finalize(GObject *obj)
-{
- GalagoGtkAccountOptionMenu *optmenu;
-
- g_return_if_fail(obj != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(obj));
-
- optmenu = GALAGO_GTK_ACCOUNT_OPTION_MENU(obj);
-
- g_free(optmenu->priv);
-
- if (G_OBJECT_CLASS(parent_class)->finalize)
- G_OBJECT_CLASS(parent_class)->finalize(obj);
-}
-
-static void
-galago_gtk_account_option_menu_destroy(GtkObject *obj)
-{
- GalagoGtkAccountOptionMenu *optmenu;
-
- g_return_if_fail(obj != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(obj));
-
- optmenu = GALAGO_GTK_ACCOUNT_OPTION_MENU(obj);
-
- GALAGO_GTK_DISCONNECT_HANDLER(optmenu->priv->service_optmenu,
- optmenu->priv->service_changed_id);
- GALAGO_GTK_DISCONNECT_HANDLER(optmenu->priv->service_optmenu,
- optmenu->priv->service_optmenu_destroyed_id);
- GALAGO_GTK_DISCONNECT_HANDLER(galago_get_core(),
- optmenu->priv->person_added_id);
- GALAGO_GTK_DISCONNECT_HANDLER(galago_get_core(),
- optmenu->priv->person_destroy_id);
-
- GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
- GALAGO_TYPE_SERVICE, "account-added",
- optmenu->priv->account_added_id);
-
- GALAGO_GTK_DISCONNECT_EMISSION_HANDLER(
- GALAGO_TYPE_SERVICE, "account-removed",
- optmenu->priv->account_removed_id);
-
- if (GTK_OBJECT_CLASS(parent_class)->destroy)
- GTK_OBJECT_CLASS(parent_class)->destroy(obj);
-}
-
-static void
-append_account(GtkWidget *menu, GalagoAccount *account)
-{
- GtkWidget *menuitem;
-
- menuitem = galago_gtk_account_menu_item_new(account);
- gtk_widget_show(menuitem);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-}
-
-static void
-append_accounts_from_person(GalagoGtkAccountOptionMenu *optmenu,
- GtkWidget *menu, GalagoPerson *person,
- GalagoService *service)
-{
- GList *l;
-
- for (l = galago_person_get_accounts(person, TRUE);
- l != NULL;
- l = l->next)
- {
- GalagoAccount *account = (GalagoAccount *)l->data;
-
- if (service == NULL || galago_account_get_service(account) == service)
- append_account(menu, account);
- }
-}
-
-static void
-append_accounts_from_service(GalagoGtkAccountOptionMenu *optmenu,
- GtkWidget *menu, GalagoService *service)
-{
- GList *l;
-
- for (l = galago_service_get_accounts(service, TRUE);
- l != NULL;
- l = l->next)
- {
- append_account(menu, (GalagoAccount *)l->data);
- }
-}
-
-static void
-rebuild_list(GalagoGtkAccountOptionMenu *optmenu)
-{
- GtkWidget *menu;
-
- if (optmenu->priv->rebuilding_list)
- return;
-
- optmenu->priv->rebuilding_list = TRUE;
-
- menu = gtk_menu_new();
-
- if (optmenu->priv->person != NULL)
- {
- append_accounts_from_person(optmenu, menu,
- optmenu->priv->person,
- optmenu->priv->service);
- }
- else if (optmenu->priv->person == NULL && optmenu->priv->me_person_set)
- {
- gtk_widget_destroy(menu);
- goto exit;
- }
- else if (optmenu->priv->service != NULL)
- {
- append_accounts_from_service(optmenu, menu,
- optmenu->priv->service);
- }
- else
- {
- GList *l;
-
- for (l = galago_get_services(GALAGO_REMOTE, TRUE);
- l != NULL;
- l = l->next)
- {
- append_accounts_from_service(optmenu, menu,
- (GalagoService *)l->data);
- }
- }
-
- gtk_widget_show(menu);
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
-
-exit:
- optmenu->priv->rebuilding_list = FALSE;
-}
-
-static gboolean
-account_added_removed_cb(GSignalInvocationHint *ihint, guint n_param_values,
- const GValue *param_values, gpointer data)
-{
- GalagoGtkAccountOptionMenu *optmenu = (GalagoGtkAccountOptionMenu *)data;
- GalagoService *service;
- GalagoAccount *cur_account;
- GalagoAccount *account;
-
- g_assert(n_param_values > 1);
-
- service = g_value_get_object(¶m_values[0]);
- account = g_value_get_pointer(¶m_values[1]);
-
- if (optmenu->priv->service != NULL && service != optmenu->priv->service)
- return TRUE;
-
- cur_account = galago_gtk_account_option_menu_get_active(optmenu);
-
- rebuild_list(optmenu);
-
- if ((ihint->signal_id == g_signal_lookup("account-added",
- GALAGO_TYPE_SERVICE) &&
- cur_account != NULL) ||
- (ihint->signal_id == g_signal_lookup("account-removed",
- GALAGO_TYPE_SERVICE) &&
- cur_account == account))
- {
- if (galago_gtk_account_option_menu_get_active(optmenu) != cur_account)
- galago_gtk_account_option_menu_set_active(optmenu, cur_account);
- }
- else
- {
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
- }
-
- return TRUE;
-}
-
-static void
-person_added_cb(void *obj, const char *property, GalagoPerson *person,
- GalagoGtkAccountOptionMenu *optmenu)
-{
- if (optmenu->priv->me_person_set && galago_person_is_me(person))
- galago_gtk_account_option_menu_set_person(optmenu, person);
-}
-
-static void
-person_destroy_cb(GalagoPerson *person, GalagoGtkAccountOptionMenu *optmenu)
-{
- optmenu->priv->person = NULL;
-
- GALAGO_GTK_DISCONNECT_HANDLER(person, optmenu->priv->person_destroy_id);
-
- if (galago_person_is_me(person))
- {
- optmenu->priv->person_added_id =
- g_signal_connect(G_OBJECT(galago_get_core()), "person-added",
- G_CALLBACK(person_added_cb), optmenu);
- }
-}
-
-GtkWidget *
-galago_gtk_account_option_menu_new(gboolean me_accounts)
-{
- GalagoGtkAccountOptionMenu *optmenu;
-
- optmenu = g_object_new(GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU, NULL);
-
- optmenu->priv->me_accounts = me_accounts;
-
- if (me_accounts)
- {
- galago_gtk_account_option_menu_set_person(optmenu,
- galago_get_me(GALAGO_REMOTE, TRUE));
- }
-
- rebuild_list(optmenu);
-
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
-
- return GTK_WIDGET(optmenu);
-}
-
-void
-galago_gtk_account_option_menu_set_person(GalagoGtkAccountOptionMenu *optmenu,
- GalagoPerson *person)
-{
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu));
-
- if (optmenu->priv->person == person)
- return;
-
- optmenu->priv->person = person;
-
- if (person != NULL)
- {
- optmenu->priv->me_person_set = galago_person_is_me(person);
-
- optmenu->priv->person_destroy_id =
- g_signal_connect(G_OBJECT(person), "destroy",
- G_CALLBACK(person_destroy_cb), optmenu);
- }
- else
- optmenu->priv->me_person_set = FALSE;
-
- rebuild_list(optmenu);
-}
-
-GalagoPerson *
-galago_gtk_account_option_menu_get_person(
- const GalagoGtkAccountOptionMenu *optmenu)
-{
- g_return_val_if_fail(optmenu != NULL, NULL);
- g_return_val_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu), NULL);
-
- return optmenu->priv->person;
-}
-
-void
-galago_gtk_account_option_menu_set_service(GalagoGtkAccountOptionMenu *optmenu,
- GalagoService *service)
-{
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu));
-
- if (optmenu->priv->service == service)
- return;
-
- optmenu->priv->service = service;
-
- rebuild_list(optmenu);
-}
-
-GalagoService *
-galago_gtk_account_option_menu_get_service(
- const GalagoGtkAccountOptionMenu *optmenu)
-{
- g_return_val_if_fail(optmenu != NULL, NULL);
- g_return_val_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu), NULL);
-
- return optmenu->priv->service;
-}
-
-void
-galago_gtk_account_option_menu_set_active(GalagoGtkAccountOptionMenu *optmenu,
- const GalagoAccount *account)
-{
- GtkWidget *menu;
- GList *l;
- int i;
-
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu));
- g_return_if_fail(account != NULL);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
-
- for (l = gtk_container_get_children(GTK_CONTAINER(menu)), i = 0;
- l != NULL;
- l = l->next, i++)
- {
- GtkWidget *menuitem = GTK_WIDGET(l);
- GalagoAccount *temp_account;
-
- if (!GALAGO_GTK_IS_ACCOUNT_MENU_ITEM(menuitem))
- continue;
-
- temp_account = galago_gtk_account_menu_item_get_account(
- GALAGO_GTK_ACCOUNT_MENU_ITEM(menuitem));
-
- if (temp_account == account)
- {
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), i);
- break;
- }
- }
-}
-
-GalagoAccount *
-galago_gtk_account_option_menu_get_active(
- const GalagoGtkAccountOptionMenu *optmenu)
-{
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- g_return_val_if_fail(optmenu != NULL, NULL);
- g_return_val_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu), NULL);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
-
- if (menu == NULL)
- return NULL;
-
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
-
- g_return_val_if_fail(GALAGO_GTK_IS_ACCOUNT_MENU_ITEM(menuitem), NULL);
-
- return galago_gtk_account_menu_item_get_account(
- GALAGO_GTK_ACCOUNT_MENU_ITEM(menuitem));
-}
-
-static void
-service_changed_cb(GalagoGtkServiceOptionMenu *service_optmenu,
- GalagoService *service, GalagoGtkAccountOptionMenu *optmenu)
-{
- galago_gtk_account_option_menu_set_service(optmenu,
- galago_gtk_service_option_menu_get_active(service_optmenu));
-}
-
-static void
-service_optmenu_destroyed_cb(GalagoGtkServiceOptionMenu *service_optmenu,
- GalagoGtkAccountOptionMenu *optmenu)
-{
- optmenu->priv->service_changed_id = 0;
- optmenu->priv->service_optmenu_destroyed_id = 0;
- optmenu->priv->service_optmenu = NULL;
-
- galago_gtk_account_option_menu_set_service(optmenu, NULL);
-}
-
-void
-galago_gtk_account_option_menu_set_services_option_menu(
- GalagoGtkAccountOptionMenu *optmenu, GtkWidget *service_optmenu)
-{
- GalagoService *service = NULL;
-
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu));
- g_return_if_fail(service_optmenu == NULL ||
- GALAGO_GTK_IS_SERVICE_OPTION_MENU(service_optmenu));
-
- if (service_optmenu == optmenu->priv->service_optmenu)
- return;
-
- GALAGO_GTK_DISCONNECT_HANDLER(optmenu->priv->service_optmenu,
- optmenu->priv->service_changed_id);
- GALAGO_GTK_DISCONNECT_HANDLER(optmenu->priv->service_optmenu,
- optmenu->priv->service_optmenu_destroyed_id);
-
- optmenu->priv->service_optmenu = service_optmenu;
-
- if (service_optmenu != NULL)
- {
- optmenu->priv->service_changed_id =
- g_signal_connect(G_OBJECT(service_optmenu), "service_changed",
- G_CALLBACK(service_changed_cb), optmenu);
- optmenu->priv->service_optmenu_destroyed_id =
- g_signal_connect(G_OBJECT(service_optmenu), "destroy",
- G_CALLBACK(service_optmenu_destroyed_cb),
- optmenu);
-
- service = galago_gtk_service_option_menu_get_active(
- GALAGO_GTK_SERVICE_OPTION_MENU(service_optmenu));
- }
-
- galago_gtk_account_option_menu_set_service(optmenu, service);
-}
-
-GtkWidget *
-galago_gtk_account_option_menu_get_services_option_menu(
- const GalagoGtkAccountOptionMenu *optmenu)
-{
- g_return_val_if_fail(optmenu != NULL, NULL);
- g_return_val_if_fail(GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(optmenu), NULL);
-
- return optmenu->priv->service_optmenu;
-}
Deleted: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.h 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-account-option-menu.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,100 +0,0 @@
-/**
- * @file libgalago-gtk/galago-gtk-account-option-menu.h
- * Account OptionMenu widget.
- *
- * @Copyright (C) 2004-2005 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef _GALAGO_GTK_ACCOUNT_OPTION_MENU_H_
-#define _GALAGO_GTK_ACCOUNT_OPTION_MENU_H_
-
-#include <gtk/gtk.h>
-
-typedef struct _GalagoGtkAccountOptionMenu GalagoGtkAccountOptionMenu;
-typedef struct _GalagoGtkAccountOptionMenuClass GalagoGtkAccountOptionMenuClass;
-typedef struct _GalagoGtkAccountOptionMenuPriv GalagoGtkAccountOptionMenuPriv;
-
-#include <libgalago/galago.h>
-
-#include <libgalago-gtk/galago-gtk-service-option-menu.h>
-
-#define GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU (galago_gtk_account_option_menu_get_type())
-#define GALAGO_GTK_ACCOUNT_OPTION_MENU(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU, GalagoGtkAccountOptionMenu))
-#define GALAGO_GTK_ACCOUNT_OPTION_MENU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU, GalagoGtkAccountOptionMenuClass))
-#define GALAGO_GTK_IS_ACCOUNT_OPTION_MENU(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU))
-#define GALAGO_GTK_IS_ACCOUNT_OPTION_MENU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU))
-#define GALAGO_GTK_ACCOUNT_OPTION_MENU_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU, GalagoGtkAccountOptionMenuClass))
-
-struct _GalagoGtkAccountOptionMenu
-{
- GtkOptionMenu parent_object;
-
- GalagoGtkAccountOptionMenuPriv *priv;
-
- void (*gtk_reserved1)(void);
- void (*gtk_reserved2)(void);
- void (*gtk_reserved3)(void);
- void (*gtk_reserved4)(void);
-};
-
-struct _GalagoGtkAccountOptionMenuClass
-{
- GtkOptionMenuClass parent_class;
-
- /* Signals */
- void (*account_changed)(GalagoGtkAccountOptionMenu *optmenu,
- GalagoAccount *account);
-
- void (*gtk_reserved1)(void);
- void (*gtk_reserved2)(void);
- void (*gtk_reserved3)(void);
- void (*gtk_reserved4)(void);
-};
-
-G_BEGIN_DECLS
-
-GType galago_gtk_account_option_menu_get_type(void);
-
-GtkWidget *galago_gtk_account_option_menu_new(gboolean me_accounts);
-
-void galago_gtk_account_option_menu_set_person(
- GalagoGtkAccountOptionMenu *optmenu, GalagoPerson *person);
-GalagoPerson *galago_gtk_account_option_menu_get_person(
- const GalagoGtkAccountOptionMenu *optmenu);
-void galago_gtk_account_option_menu_set_service(
- GalagoGtkAccountOptionMenu *optmenu, GalagoService *service);
-GalagoService *galago_gtk_account_option_menu_get_service(
- const GalagoGtkAccountOptionMenu *optmenu);
-
-void galago_gtk_account_option_menu_set_active(
- GalagoGtkAccountOptionMenu *optmenu, const GalagoAccount *account);
-GalagoAccount *galago_gtk_account_option_menu_get_active(
- const GalagoGtkAccountOptionMenu *optmenu);
-
-void galago_gtk_account_option_menu_set_services_option_menu(
- GalagoGtkAccountOptionMenu *optmenu, GtkWidget *service_optmenu);
-GtkWidget *galago_gtk_account_option_menu_get_services_option_menu(
- const GalagoGtkAccountOptionMenu *optmenu);
-
-G_END_DECLS
-
-#endif /* _GALAGO_GTK_ACCOUNT_OPTION_MENU_H_ */
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.c 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -21,8 +21,6 @@
*/
#include <libgalago-gtk/galago-gtk-entry-completion.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
GtkEntryCompletion *
galago_gtk_entry_completion_new_with_accounts(const GalagoService *service,
gboolean query)
@@ -71,5 +69,3 @@
{
return NULL;
}
-
-#endif /* GTK_CHECK_VERSION(2,4,0) */
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.h 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-entry-completion.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -24,8 +24,6 @@
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
#include <libgalago/galago.h>
G_BEGIN_DECLS
@@ -39,6 +37,4 @@
G_END_DECLS
-#endif /* GTK_CHECK_VERSION(2,4,0) */
-
#endif /* _GALAGO_GTK_COMPLETION_H_ */
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-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -24,8 +24,6 @@
#include <libgalago/galago.h>
#include <string.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
struct _GalagoGtkServiceComboBoxPriv
{
gboolean rebuilding_list;
@@ -342,5 +340,3 @@
return service;
}
-
-#endif /* GTK_CHECK_VERSION(2,4,0) */
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-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-combo-box.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -23,8 +23,6 @@
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(2,4,0)
-
typedef struct _GalagoGtkServiceComboBox GalagoGtkServiceComboBox;
typedef struct _GalagoGtkServiceComboBoxClass GalagoGtkServiceComboBoxClass;
typedef struct _GalagoGtkServiceComboBoxPriv GalagoGtkServiceComboBoxPriv;
@@ -82,6 +80,4 @@
G_END_DECLS
-#endif /* GTK_CHECK_VERSION(2,4,0) */
-
#endif /* _GALAGO_GTK_SERVICE_COMBO_BOX_H_ */
Deleted: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.c
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.c 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,319 +0,0 @@
-/**
- * @file libgalago-gtk/galago-gtk-service-option-menu.c
- * Service OptionMenu widget
- *
- * @Copyright (C) 2004-2005 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include <libgalago-gtk/galago-gtk-service-option-menu.h>
-#include <libgalago-gtk/galago-gtk-service-menu-item.h>
-#include <libgalago-gtk/galago-gdk-pixbuf.h>
-#include <libgalago-gtk/galago-gtk-private.h>
-#include <libgalago/galago.h>
-#include <string.h>
-
-struct _GalagoGtkServiceOptionMenuPriv
-{
- gboolean rebuilding_list;
-
- gulong service_added_id;
- gulong service_removed_id;
-};
-
-enum
-{
- SERVICE_CHANGED,
- LAST_SIGNAL
-};
-
-enum
-{
- COLUMN_DATA,
- COLUMN_ICON,
- COLUMN_NAME,
- NUM_COLUMNS
-};
-
-static void galago_gtk_service_option_menu_class_init(
- GalagoGtkServiceOptionMenuClass *klass);
-static void galago_gtk_service_option_menu_init(
- GalagoGtkServiceOptionMenu *optmenu);
-static void galago_gtk_service_option_menu_finalize(GObject *obj);
-static void galago_gtk_service_option_menu_destroy(GtkObject *obj);
-static void service_added_cb(GalagoObject *core, GalagoService *service,
- GalagoGtkServiceOptionMenu *optmenu);
-static void service_removed_cb(GalagoObject *core, GalagoService *service,
- GalagoGtkServiceOptionMenu *optmenu);
-
-static GtkOptionMenuClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = {0};
-
-GType
-galago_gtk_service_option_menu_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo info =
- {
- sizeof(GalagoGtkServiceOptionMenuClass),
- NULL,
- NULL,
- (GClassInitFunc)galago_gtk_service_option_menu_class_init,
- NULL,
- NULL,
- sizeof(GalagoGtkServiceOptionMenu),
- 0,
- (GInstanceInitFunc)galago_gtk_service_option_menu_init
- };
-
- type = g_type_register_static(GTK_TYPE_OPTION_MENU,
- "GalagoGtkServiceOptionMenu", &info, 0);
- }
-
- return type;
-}
-
-static void
-galago_gtk_service_option_menu_class_init(
- GalagoGtkServiceOptionMenuClass *klass)
-{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
-
- parent_class = g_type_class_peek_parent(klass);
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = GTK_OBJECT_CLASS(klass);
-
- gobject_class->finalize = galago_gtk_service_option_menu_finalize;
-
- object_class->destroy = galago_gtk_service_option_menu_destroy;
-
- signals[SERVICE_CHANGED] =
- g_signal_new("service_changed",
- G_TYPE_FROM_CLASS(gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET(GalagoGtkServiceOptionMenuClass,
- service_changed),
- NULL, NULL,
- gtk_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
-}
-
-static void
-option_menu_changed(GalagoGtkServiceOptionMenu *optmenu, gpointer user_data)
-{
- GalagoService *service;
-
- service = galago_gtk_service_option_menu_get_active(optmenu);
-
- g_signal_emit(optmenu, signals[SERVICE_CHANGED], 0, service);
-}
-
-static void
-galago_gtk_service_option_menu_init(GalagoGtkServiceOptionMenu *optmenu)
-{
- optmenu->priv = g_new0(GalagoGtkServiceOptionMenuPriv, 1);
-
- g_signal_connect(G_OBJECT(optmenu), "changed",
- G_CALLBACK(option_menu_changed), NULL);
-
- optmenu->priv->service_added_id =
- g_signal_connect(G_OBJECT(galago_get_core()), "service-added",
- G_CALLBACK(service_added_cb), optmenu);
- optmenu->priv->service_removed_id =
- g_signal_connect(G_OBJECT(galago_get_core()), "service-removed",
- G_CALLBACK(service_removed_cb), optmenu);
-}
-
-static void
-galago_gtk_service_option_menu_finalize(GObject *obj)
-{
- GalagoGtkServiceOptionMenu *optmenu;
-
- g_return_if_fail(obj != NULL);
- g_return_if_fail(GALAGO_GTK_IS_SERVICE_OPTION_MENU(obj));
-
- optmenu = GALAGO_GTK_SERVICE_OPTION_MENU(obj);
-
- g_free(optmenu->priv);
-
- if (G_OBJECT_CLASS(parent_class)->finalize)
- G_OBJECT_CLASS(parent_class)->finalize(obj);
-}
-
-static void
-galago_gtk_service_option_menu_destroy(GtkObject *obj)
-{
- GalagoGtkServiceOptionMenu *optmenu;
-
- g_return_if_fail(obj != NULL);
- g_return_if_fail(GALAGO_GTK_IS_SERVICE_OPTION_MENU(obj));
-
- optmenu = GALAGO_GTK_SERVICE_OPTION_MENU(obj);
-
- GALAGO_GTK_DISCONNECT_HANDLER(galago_get_core(),
- optmenu->priv->service_added_id);
- GALAGO_GTK_DISCONNECT_HANDLER(galago_get_core(),
- optmenu->priv->service_removed_id);
-
- if (GTK_OBJECT_CLASS(parent_class)->destroy)
- GTK_OBJECT_CLASS(parent_class)->destroy(obj);
-}
-
-static void
-rebuild_list(GalagoGtkServiceOptionMenu *optmenu)
-{
- GList *l;
- GtkWidget *menuitem;
- GtkWidget *menu;
-
- if (optmenu->priv->rebuilding_list)
- return;
-
- optmenu->priv->rebuilding_list = TRUE;
-
- menu = gtk_menu_new();
- gtk_widget_show(menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
-
- for (l = galago_get_services(GALAGO_REMOTE, TRUE);
- l != NULL;
- l = l->next)
- {
- GalagoService *service = (GalagoService *)l->data;
-
- menuitem = galago_gtk_service_menu_item_new(service);
- gtk_widget_show(menuitem);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
- }
-
- optmenu->priv->rebuilding_list = FALSE;
-}
-
-static void
-service_added_cb(GalagoObject *core, GalagoService *service,
- GalagoGtkServiceOptionMenu *optmenu)
-{
- GalagoService *cur_service;
-
- cur_service = galago_gtk_service_option_menu_get_active(optmenu);
-
- rebuild_list(optmenu);
-
- if (cur_service != NULL)
- {
- if (galago_gtk_service_option_menu_get_active(optmenu) != cur_service)
- galago_gtk_service_option_menu_set_active(optmenu, cur_service);
- }
- else
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
-}
-
-static void
-service_removed_cb(GalagoObject *core, GalagoService *service,
- GalagoGtkServiceOptionMenu *optmenu)
-{
- GalagoService *cur_service;
-
- cur_service = galago_gtk_service_option_menu_get_active(optmenu);
-
- rebuild_list(optmenu);
-
- if (cur_service == service)
- {
- if (galago_gtk_service_option_menu_get_active(optmenu) != cur_service)
- galago_gtk_service_option_menu_set_active(optmenu, cur_service);
- }
- else
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
-}
-
-GtkWidget *
-galago_gtk_service_option_menu_new(void)
-{
- GalagoGtkServiceOptionMenu *optmenu;
-
- optmenu = g_object_new(GALAGO_GTK_TYPE_SERVICE_OPTION_MENU, NULL);
-
- rebuild_list(optmenu);
-
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0);
-
- return GTK_WIDGET(optmenu);
-}
-
-void
-galago_gtk_service_option_menu_set_active(GalagoGtkServiceOptionMenu *optmenu,
- const GalagoService *service)
-{
- GtkWidget *menu;
- GList *l;
- int i;
-
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(GALAGO_GTK_IS_SERVICE_OPTION_MENU(optmenu));
- g_return_if_fail(service != NULL);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
-
- for (l = gtk_container_get_children(GTK_CONTAINER(menu)), i = 0;
- l != NULL;
- l = l->next, i++)
- {
- GtkWidget *menuitem = GTK_WIDGET(l);
- GalagoService *temp_service;
-
- if (!GALAGO_GTK_IS_SERVICE_MENU_ITEM(menuitem))
- continue;
-
- temp_service = galago_gtk_service_menu_item_get_service(
- GALAGO_GTK_SERVICE_MENU_ITEM(menuitem));
-
- if (temp_service == service)
- {
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), i);
- break;
- }
- }
-}
-
-GalagoService *
-galago_gtk_service_option_menu_get_active(
- const GalagoGtkServiceOptionMenu *optmenu)
-{
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- g_return_val_if_fail(optmenu != NULL, NULL);
- g_return_val_if_fail(GALAGO_GTK_IS_SERVICE_OPTION_MENU(optmenu), NULL);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
-
- if (menu == NULL)
- return NULL;
-
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
-
- g_return_val_if_fail(GALAGO_GTK_IS_SERVICE_MENU_ITEM(menuitem), NULL);
-
- return galago_gtk_service_menu_item_get_service(
- GALAGO_GTK_SERVICE_MENU_ITEM(menuitem));
-}
Deleted: trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.h 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk-service-option-menu.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,84 +0,0 @@
-/**
- * @file libgalago-gtk/galago-gtk-service-option-menu.h
- * Service OptionMenu widget
- *
- * @Copyright (C) 2004-2005 Christian Hammond.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef _GALAGO_GTK_SERVICE_OPTION_MENU_H_
-#define _GALAGO_GTK_SERVICE_OPTION_MENU_H_
-
-#include <gtk/gtk.h>
-
-typedef struct _GalagoGtkServiceOptionMenu GalagoGtkServiceOptionMenu;
-typedef struct _GalagoGtkServiceOptionMenuClass GalagoGtkServiceOptionMenuClass;
-typedef struct _GalagoGtkServiceOptionMenuPriv GalagoGtkServiceOptionMenuPriv;
-
-#include <libgalago/galago.h>
-
-#define GALAGO_GTK_TYPE_SERVICE_OPTION_MENU (galago_gtk_service_option_menu_get_type())
-#define GALAGO_GTK_SERVICE_OPTION_MENU(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GALAGO_GTK_TYPE_SERVICE_OPTION_MENU, GalagoGtkServiceOptionMenu))
-#define GALAGO_GTK_SERVICE_OPTION_MENU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GALAGO_GTK_TYPE_SERVICE_OPTION_MENU, GalagoGtkServiceOptionMenuClass))
-#define GALAGO_GTK_IS_SERVICE_OPTION_MENU(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GALAGO_GTK_TYPE_SERVICE_OPTION_MENU))
-#define GALAGO_GTK_IS_SERVICE_OPTION_MENU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GALAGO_GTK_TYPE_SERVICE_OPTION_MENU))
-#define GALAGO_GTK_SERVICE_OPTION_MENU_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GALAGO_GTK_TYPE_SERVICE_OPTION_MENU, GalagoGtkServiceOptionMenuClass))
-
-struct _GalagoGtkServiceOptionMenu
-{
- GtkOptionMenu parent_object;
-
- GalagoGtkServiceOptionMenuPriv *priv;
-
- void (*gtk_reserved1)(void);
- void (*gtk_reserved2)(void);
- void (*gtk_reserved3)(void);
- void (*gtk_reserved4)(void);
-};
-
-struct _GalagoGtkServiceOptionMenuClass
-{
- GtkOptionMenuClass parent_class;
-
- /* Signals */
- void (*service_changed)(GalagoGtkServiceOptionMenu *list,
- GalagoService *service);
-
- void (*gtk_reserved1)(void);
- void (*gtk_reserved2)(void);
- void (*gtk_reserved3)(void);
- void (*gtk_reserved4)(void);
-};
-
-G_BEGIN_DECLS
-
-GType galago_gtk_service_option_menu_get_type(void);
-
-GtkWidget *galago_gtk_service_option_menu_new(void);
-
-void galago_gtk_service_option_menu_set_active(
- GalagoGtkServiceOptionMenu *optmenu, const GalagoService *service);
-GalagoService *galago_gtk_service_option_menu_get_active(
- const GalagoGtkServiceOptionMenu *optmenu);
-
-G_END_DECLS
-
-#endif /* _GALAGO_GTK_SERVICE_OPTION_MENU_H_ */
Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h 2006-03-17 07:27:16 UTC (rev 2604)
@@ -45,9 +45,4 @@
#include <libgalago-gtk/galago-gtk-tooltips.h>
#include <libgalago-gtk/galago-gtk-types.h>
-#if !GTK_CHECK_VERSION(2,4,0) || !defined(GTK_DISABLE_DEPRECATED)
-# include <libgalago-gtk/galago-gtk-account-option-menu.h>
-# include <libgalago-gtk/galago-gtk-service-option-menu.h>
-#endif
-
#endif /* _GALAGO_GTK_H_ */
Modified: trunk/libgalago-gtk/tests/test-presence-icon.c
===================================================================
--- trunk/libgalago-gtk/tests/test-presence-icon.c 2006-03-17 07:21:44 UTC (rev 2603)
+++ trunk/libgalago-gtk/tests/test-presence-icon.c 2006-03-17 07:27:16 UTC (rev 2604)
@@ -1,10 +1,6 @@
#include <libgalago-gtk/galago-gtk.h>
#include <stdio.h>
-#if !GTK_CHECK_VERSION(2,4,0)
-# define USE_GTK22_WIDGETS 1
-#endif
-
static GtkWidget *service_list = NULL;
static GtkWidget *account_list = NULL;
static GtkWidget *user_entry = NULL;
@@ -44,17 +40,10 @@
GalagoAccount *account, *contact;
const char *user;
-#ifndef USE_GTK22_WIDGETS
service = galago_gtk_service_combo_box_get_active(
GALAGO_GTK_SERVICE_COMBO_BOX(service_list));
account = galago_gtk_account_combo_box_get_active(
GALAGO_GTK_ACCOUNT_COMBO_BOX(account_list));
-#else
- service = galago_gtk_service_option_menu_get_active(
- GALAGO_GTK_SERVICE_OPTION_MENU(service_list));
- account = galago_gtk_account_option_menu_get_active(
- GALAGO_GTK_ACCOUNT_OPTION_MENU(account_list));
-#endif
user = gtk_entry_get_text(GTK_ENTRY(user_entry));
@@ -74,7 +63,6 @@
GALAGO_GTK_PRESENCE_ICON(presence_icon_large));
}
-#ifndef USE_GTK22_WIDGETS
static void
icon_type_changed(GtkComboBox *icon_combo, GtkListStore *icon_model)
{
@@ -91,39 +79,7 @@
GALAGO_GTK_PRESENCE_ICON(presence_icon_large),
precedence);
}
-#else
-static void
-icon_type_changed(GtkMenuItem *menu_item, gpointer user_data)
-{
- GalagoGtkIconPrecedence precedence;
- precedence = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item),
- "icon_precedence"));
-
- galago_gtk_presence_icon_set_precedence(
- GALAGO_GTK_PRESENCE_ICON(presence_icon_large),
- precedence);
-}
-
-static GtkWidget *
-add_precedence_menu_item(GtkMenuShell *menu_shell, const char *title,
- GalagoGtkIconPrecedence precedence)
-{
- GtkWidget *item = gtk_menu_item_new_with_label(title);
-
- gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), item);
- gtk_widget_show(item);
-
- g_object_set_data(G_OBJECT(item),
- "icon_precedence", GINT_TO_POINTER(precedence));
-
- g_signal_connect(G_OBJECT(item), "activate",
- G_CALLBACK(icon_type_changed), NULL);
-
- return item;
-}
-#endif
-
int
main(int argc, char **argv)
{
@@ -137,14 +93,10 @@
GtkWidget *icon_combo;
GalagoGtkTooltips *tooltips;
GtkSizeGroup *sg;
-#ifndef USE_GTK22_WIDGETS
GtkCellRenderer *cell;
GtkListStore *icon_model;
GtkTreeIter iter;
GtkEntryCompletion *completion;
-#else
- GtkWidget *icon_menu;
-#endif
gtk_init(&argc, &argv);
@@ -195,26 +147,16 @@
/* Add the Service box */
hbox = add_box(vbox, sg, "_Service:");
-#ifndef USE_GTK22_WIDGETS
service_list = galago_gtk_service_combo_box_new();
-#else
- service_list = galago_gtk_service_option_menu_new();
-#endif
gtk_box_pack_start(GTK_BOX(hbox), service_list, TRUE, TRUE, 0);
gtk_widget_show(service_list);
/* Add the Account box */
hbox = add_box(vbox, sg, "_Account:");
-#ifndef USE_GTK22_WIDGETS
account_list = galago_gtk_account_combo_box_new(TRUE);
galago_gtk_account_combo_box_set_services_combo_box(
GALAGO_GTK_ACCOUNT_COMBO_BOX(account_list), service_list);
-#else
- account_list = galago_gtk_account_option_menu_new(TRUE);
- galago_gtk_account_option_menu_set_services_option_menu(
- GALAGO_GTK_ACCOUNT_OPTION_MENU(account_list), service_list);
-#endif
gtk_box_pack_start(GTK_BOX(hbox), account_list, TRUE, TRUE, 0);
gtk_widget_show(account_list);
@@ -224,11 +166,9 @@
gtk_box_pack_start(GTK_BOX(hbox), user_entry, TRUE, TRUE, 0);
gtk_widget_show(user_entry);
-#ifndef USE_GTK22_WIDGETS
completion = galago_gtk_entry_completion_new_with_accounts(NULL, TRUE);
gtk_entry_set_completion(GTK_ENTRY(user_entry), completion);
g_object_unref(G_OBJECT(completion));
-#endif
g_signal_connect(G_OBJECT(user_entry), "changed",
G_CALLBACK(user_entry_changed_cb), NULL);
@@ -237,7 +177,6 @@
hbox = add_box(vbox, sg, "_Icon:");
/* Icon precedence drop-down */
-#ifndef USE_GTK22_WIDGETS
icon_model = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING);
icon_combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(icon_model));
g_object_unref(G_OBJECT(icon_model));
@@ -275,24 +214,7 @@
G_CALLBACK(icon_type_changed), icon_model);
gtk_combo_box_set_active(GTK_COMBO_BOX(icon_combo), 0);
-#else
- icon_combo = gtk_option_menu_new();
- icon_menu = gtk_menu_new();
- gtk_widget_show(icon_menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(icon_combo), icon_menu);
- add_precedence_menu_item(GTK_MENU_SHELL(icon_menu),
- "Photo", GALAGO_GTK_ICON_PHOTO);
- add_precedence_menu_item(GTK_MENU_SHELL(icon_menu),
- "Avatar", GALAGO_GTK_ICON_AVATAR);
- add_precedence_menu_item(GTK_MENU_SHELL(icon_menu),
- "Protocol", GALAGO_GTK_ICON_PROTOCOL);
- add_precedence_menu_item(GTK_MENU_SHELL(icon_menu),
- "Generic", GALAGO_GTK_ICON_GENERIC);
-
- gtk_option_menu_set_history(GTK_OPTION_MENU(icon_combo), 0);
-#endif
-
gtk_box_pack_start(GTK_BOX(hbox), icon_combo, TRUE, TRUE, 0);
gtk_widget_show(icon_combo);
More information about the galago-commits
mailing list