Mercurial > pidgin.yaz
changeset 29513:0f1d7aad073c
propagate from branch 'im.pidgin.pidgin' (head 9ae9c115b1d9c775aa393b62f7522480a1b9a2d0)
to branch 'im.pidgin.pidgin.next.minor' (head c9b41aa82b8828b794842caba407439a5f1b324e)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 03 Oct 2009 21:31:14 +0000 |
| parents | 542b75da206e (current diff) b115a252abe5 (diff) |
| children | c095f1795112 |
| files | pidgin/gtkcelllayout.c pidgin/gtkcelllayout.h pidgin/gtkcellrendererprogress.c pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c pidgin/gtkcellview.h pidgin/gtkcellviewmenuitem.c pidgin/gtkcellviewmenuitem.h pidgin/gtkdialogs.c pidgin/gtkexpander.c pidgin/gtkexpander.h pidgin/pidgincombobox.c pidgin/pidgincombobox.h |
| diffstat | 96 files changed, 566 insertions(+), 9911 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 03 21:30:52 2009 +0000 +++ b/ChangeLog Sat Oct 03 21:31:14 2009 +0000 @@ -1,5 +1,18 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.0 (??/??/????): + General: + * Changed GTK+ minimum version requirement to 2.10.0. + * Changed GLib minimum version requirement to 2.12.0. + + Pidgin: + * Moved the "Debugging Information" section of the About box to a + "Build Information" dialog accessible on the Help menu. + * Moved the Developer and Crazy Patch Writer information from the About + box to a "Developer Information" dialog accessible on the Help menu. + * Moved the Translator information from the About box to a "Translator + Information" dialog accessible on the Help menu. + version 2.6.3 (??/??/20??): XMPP: * Fix a crash when attempting to validate an invalid JID.
--- a/ChangeLog.API Sat Oct 03 21:30:52 2009 +0000 +++ b/ChangeLog.API Sat Oct 03 21:31:14 2009 +0000 @@ -1,5 +1,17 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.0 (??/??/????): + libpurple: + Added: + * purple_account_get_name_for_display + * purple_network_get_all_local_system_ips + + Pidgin: + Added: + * pidgin_dialogs_buildinfo (should not be used by anything but Pidgin) + * pidgin_dialogs_developers (should not be used by anything but Pidgin) + * pidgin_dialogs_translators (should not be used by anything but Pidgin) + version 2.6.2 (09/05/2009): Perl: Added:
--- a/ChangeLog.win32 Sat Oct 03 21:30:52 2009 +0000 +++ b/ChangeLog.win32 Sat Oct 03 21:31:14 2009 +0000 @@ -1,3 +1,7 @@ +version 2.7.0 (??/??/????): + * Minimum required GTK+ version increased to 2.14.0 + * Win9x no longer supported. + version 2.6.2 (09/05/2009): * No changes
--- a/configure.ac Sat Oct 03 21:30:52 2009 +0000 +++ b/configure.ac Sat Oct 03 21:31:14 2009 +0000 @@ -43,19 +43,19 @@ # # Make sure to update finch/libgnt/configure.ac with libgnt version changes. # -m4_define([purple_lt_current], [6]) +m4_define([purple_lt_current], [7]) m4_define([purple_major_version], [2]) -m4_define([purple_minor_version], [6]) -m4_define([purple_micro_version], [3]) +m4_define([purple_minor_version], [7]) +m4_define([purple_micro_version], [0]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) -m4_define([gnt_lt_current], [6]) +m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [3]) +m4_define([gnt_minor_version], [7]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -310,9 +310,9 @@ ) dnl ####################################################################### -dnl # Check for GLib 2.0 (required) +dnl # Check for GLib 2.12 (required) dnl ####################################################################### -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.4.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ @@ -352,7 +352,7 @@ [enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no]) dnl ####################################################################### -dnl # Check for GTK+ 2.0 and other things used by the GTK UI +dnl # Check for GTK+ 2.10 and other things used by the GTK UI dnl ####################################################################### AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], @@ -399,11 +399,11 @@ fi if test "x$enable_gtkui" = "xyes" ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0], , [ + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ -You must have GTK+ 2.4.0 or newer development headers installed to compile +You must have GTK+ 2.10.0 or newer development headers installed to compile Pidgin. If you want to build only Finch then specify --disable-gtkui when running configure. ])])
--- a/finch/gntsound.c Sat Oct 03 21:30:52 2009 +0000 +++ b/finch/gntsound.c Sat Oct 03 21:31:14 2009 +0000 @@ -559,18 +559,12 @@ #else /* _WIN32 */ purple_debug_info("sound", "Playing %s\n", filename); - if (G_WIN32_HAVE_WIDECHAR_API ()) { + { wchar_t *wc_filename = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL); if (!PlaySoundW(wc_filename, NULL, SND_ASYNC | SND_FILENAME)) purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n"); g_free(wc_filename); - } else { - char *l_filename = g_locale_from_utf8(filename, - -1, NULL, NULL, NULL); - if (!PlaySoundA(l_filename, NULL, SND_ASYNC | SND_FILENAME)) - purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n"); - g_free(l_filename); } #endif /* _WIN32 */ }
--- a/finch/libgnt/configure.ac Sat Oct 03 21:30:52 2009 +0000 +++ b/finch/libgnt/configure.ac Sat Oct 03 21:31:14 2009 +0000 @@ -24,10 +24,10 @@ # Make sure to update ../../configure.ac with libgnt version changes. # -m4_define([gnt_lt_current], [6]) +m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [2]) +m4_define([gnt_minor_version], [7]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version])
--- a/libpurple/account.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/account.c Sat Oct 03 21:31:14 2009 +0000 @@ -2019,6 +2019,42 @@ return account->gc; } +const gchar * +purple_account_get_name_for_display(const PurpleAccount *account) +{ + PurpleBuddy *self = NULL; + PurpleConnection *gc = NULL; + const gchar *name = NULL, *username = NULL, *displayname = NULL; + + name = purple_account_get_alias(account); + + if (name) { + return name; + } + + username = purple_account_get_username(account); + self = purple_find_buddy((PurpleAccount *)account, username); + + if (self) { + const gchar *calias= purple_buddy_get_contact_alias(self); + + /* We don't want to return the buddy name if the buddy/contact + * doesn't have an alias set. */ + if (!purple_strequal(username, calias)) { + return calias; + } + } + + gc = purple_account_get_connection(account); + displayname = purple_connection_get_display_name(gc); + + if (displayname) { + return displayname; + } + + return username; +} + gboolean purple_account_get_remember_password(const PurpleAccount *account) {
--- a/libpurple/account.h Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/account.h Sat Oct 03 21:31:14 2009 +0000 @@ -630,6 +630,20 @@ PurpleConnection *purple_account_get_connection(const PurpleAccount *account); /** + * Returns a name for this account appropriate for display to the user. In + * order of preference: the account's alias; the contact or buddy alias (if + * the account exists on its own buddy list); the connection's display name; + * the account's username. + * + * @param account The account. + * + * @return The name to display. + * + * @since 2.7.0 + */ +const gchar *purple_account_get_name_for_display(const PurpleAccount *account); + +/** * Returns whether or not this account should save its password. * * @param account The account.
--- a/libpurple/core.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/core.c Sat Oct 03 21:31:14 2009 +0000 @@ -496,7 +496,6 @@ if (purple_strequal(entry, "logs")) { char *link; -#if GLIB_CHECK_VERSION(2,4,0) err = NULL; if ((link = g_file_read_link(name, &err)) == NULL) @@ -512,27 +511,6 @@ g_free(old_user_dir); return FALSE; } -#else - char buf[MAXPATHLEN]; - size_t linklen; - - if ((linklen = readlink(name, buf, sizeof(buf) - 1) == -1)) - { - char *name_utf8 = g_filename_to_utf8(name, -1, NULL, NULL, NULL); - purple_debug_error("core", "Error reading symlink %s: %s. Please report this at " PURPLE_DEVEL_WEBSITE "\n", - name_utf8, g_strerror(errno)); - g_free(name_utf8); - g_free(name); - g_dir_close(dir); - g_free(status_file); - g_free(old_user_dir); - return FALSE; - } - buf[linklen] = '\0'; - - /* This way we don't have to GLIB_VERSION_CHECK every g_free(link) below. */ - link = g_strdup(buf); -#endif logs_dir = g_build_filename(user_dir, "logs", NULL);
--- a/libpurple/dnsquery.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/dnsquery.c Sat Oct 03 21:31:14 2009 +0000 @@ -172,6 +172,7 @@ return FALSE; } +#ifdef USE_IDN static gboolean dns_str_is_ascii(const char *name) { @@ -183,6 +184,7 @@ return TRUE; } +#endif #if defined(PURPLE_DNSQUERY_USE_FORK)
--- a/libpurple/dnssrv.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/dnssrv.c Sat Oct 03 21:31:14 2009 +0000 @@ -248,6 +248,7 @@ return list; } +#ifdef USE_IDN static gboolean dns_str_is_ascii(const char *name) { @@ -259,6 +260,7 @@ return TRUE; } +#endif #ifndef _WIN32
--- a/libpurple/internal.h Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/internal.h Sat Oct 03 21:31:14 2009 +0000 @@ -118,36 +118,13 @@ # include <unistd.h> #endif -/* MAXPATHLEN should only be used with readlink() on glib < 2.4.0. For - * anything else, use g_file_read_link() or other dynamic functions. This is - * important because Hurd has no hard limits on path length. */ -#if !GLIB_CHECK_VERSION(2,4,0) -# ifndef MAXPATHLEN -# ifdef PATH_MAX -# define MAXPATHLEN PATH_MAX -# else -# define MAXPATHLEN 1024 -# endif -# endif -#endif - #ifndef HOST_NAME_MAX # define HOST_NAME_MAX 255 #endif #include <glib.h> -#if !GLIB_CHECK_VERSION(2,4,0) -# define G_MAXUINT32 ((guint32) 0xffffffff) -#endif -#ifndef G_MAXSIZE -# if GLIB_SIZEOF_LONG == 8 -# define G_MAXSIZE ((gsize) 0xffffffffffffffff) -# else -# define G_MAXSIZE ((gsize) 0xffffffff) -# endif -#endif - +/* This wasn't introduced until Glib 2.14 :( */ #ifndef G_MAXSSIZE # if GLIB_SIZEOF_LONG == 8 # define G_MAXSSIZE ((gssize) 0x7fffffffffffffff) @@ -156,80 +133,12 @@ # endif #endif -#if GLIB_CHECK_VERSION(2,6,0) -# include <glib/gstdio.h> -#endif - -#if !GLIB_CHECK_VERSION(2,6,0) -# define g_freopen freopen -# define g_fopen fopen -# define g_rmdir rmdir -# define g_remove remove -# define g_unlink unlink -# define g_lstat lstat -# define g_stat stat -# define g_mkdir mkdir -# define g_rename rename -# define g_open open -#endif - -#if !GLIB_CHECK_VERSION(2,8,0) && !defined _WIN32 -# define g_access access -#endif - -#if !GLIB_CHECK_VERSION(2,10,0) -# define g_slice_new(type) g_new(type, 1) -# define g_slice_new0(type) g_new0(type, 1) -# define g_slice_free(type, mem) g_free(mem) -#endif +#include <glib/gstdio.h> #ifdef _WIN32 #include "win32dep.h" #endif -/* ugly ugly ugly */ -/* This is a workaround for the fact that G_GINT64_MODIFIER and G_GSIZE_FORMAT - * are only defined in Glib >= 2.4 */ -#ifndef G_GINT64_MODIFIER -# if GLIB_SIZEOF_LONG == 8 -# define G_GINT64_MODIFIER "l" -# else -# define G_GINT64_MODIFIER "ll" -# endif -#endif - -#ifndef G_GSIZE_MODIFIER -# if GLIB_SIZEOF_LONG == 8 -# define G_GSIZE_MODIFIER "l" -# else -# define G_GSIZE_MODIFIER "" -# endif -#endif - -#ifndef G_GSIZE_FORMAT -# if GLIB_SIZEOF_LONG == 8 -# define G_GSIZE_FORMAT "lu" -# else -# define G_GSIZE_FORMAT "u" -# endif -#endif - -#ifndef G_GSSIZE_FORMAT -# if GLIB_SIZEOF_LONG == 8 -# define G_GSSIZE_FORMAT "li" -# else -# define G_GSSIZE_FORMAT "i" -# endif -#endif - -#ifndef G_GNUC_NULL_TERMINATED -# if __GNUC__ >= 4 -# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -# else -# define G_GNUC_NULL_TERMINATED -# endif -#endif - #ifdef HAVE_CONFIG_H #if SIZEOF_TIME_T == 4 # define PURPLE_TIME_T_MODIFIER "lu" @@ -242,38 +151,6 @@ #include <glib-object.h> -#ifndef G_DEFINE_TYPE -#define G_DEFINE_TYPE(TypeName, type_name, TYPE_PARENT) \ -\ -static void type_name##_init (TypeName *self); \ -static void type_name##_class_init (TypeName##Class *klass); \ -static gpointer type_name##_parent_class = NULL; \ -static void type_name##_class_intern_init (gpointer klass) \ -{ \ - type_name##_parent_class = g_type_class_peek_parent (klass); \ - type_name##_class_init ((TypeName##Class*) klass); \ -} \ -\ -GType \ -type_name##_get_type (void) \ -{ \ - static GType g_define_type_id = 0; \ - if (G_UNLIKELY (g_define_type_id == 0)) \ - { \ - g_define_type_id = \ - g_type_register_static_simple (TYPE_PARENT, \ - g_intern_static_string (#TypeName), \ - sizeof (TypeName##Class), \ - (GClassInitFunc)type_name##_class_intern_init, \ - sizeof (TypeName), \ - (GInstanceInitFunc)type_name##_init, \ - (GTypeFlags) 0); \ - } \ - return g_define_type_id; \ -} /* closes type_name##_get_type() */ - -#endif - /* Safer ways to work with static buffers. When using non-static * buffers, either use g_strdup_* functions (preferred) or use * g_strlcpy/g_strlcpy directly. */
--- a/libpurple/network.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/network.c Sat Oct 03 21:31:14 2009 +0000 @@ -200,6 +200,45 @@ return "0.0.0.0"; } +GList * +purple_network_get_all_local_system_ips(void) +{ + GList *result = NULL; + int source = source = socket(PF_INET,SOCK_STREAM, 0); + char buffer[1024]; + char *tmp; + struct ifconf ifc; + struct ifreq *ifr; + + ifc.ifc_len = sizeof(buffer); + ifc.ifc_req = (struct ifreq *)buffer; + ioctl(source, SIOCGIFCONF, &ifc); + close(source); + + tmp = buffer; + while (tmp < buffer + ifc.ifc_len) { + char dst[INET_ADDRSTRLEN]; + + ifr = (struct ifreq *)tmp; + tmp += HX_SIZE_OF_IFREQ(*ifr); + + /* TODO: handle IPv6 */ + if (ifr->ifr_addr.sa_family == AF_INET) { + struct sockaddr_in *sinptr = (struct sockaddr_in *)&ifr->ifr_addr; + + inet_ntop(AF_INET, &sinptr->sin_addr, dst, + sizeof(dst)); + purple_debug_info("network", + "found local i/f with address %s on IPv4\n", dst); + if (!purple_strequal(dst, "127.0.0.1")) { + result = g_list_append(result, g_strdup(dst)); + } + } + } + + return result; +} + const char * purple_network_get_my_ip(int fd) {
--- a/libpurple/network.h Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/network.h Sat Oct 03 21:31:14 2009 +0000 @@ -88,6 +88,17 @@ const char *purple_network_get_local_system_ip(int fd); /** + * Returns all IP addresses of the local system. + * + * @note The caller must free this list, this function currently only + * handles IPv4 addresses + * @since 2.7.0 + * + * @return A list of local IP addresses. + */ +GList *purple_network_get_all_local_system_ips(void); + +/** * Returns the IP address that should be used anywhere a * public IP addresses is needed (listening for an incoming * file transfer, etc).
--- a/libpurple/plugin.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/plugin.c Sat Oct 03 21:31:14 2009 +0000 @@ -254,11 +254,7 @@ * * G_MODULE_BIND_LOCAL was added in glib 2.3.3. */ -#if GLIB_CHECK_VERSION(2,3,3) plugin->handle = g_module_open(filename, G_MODULE_BIND_LOCAL); -#else - plugin->handle = g_module_open(filename, 0); -#endif if (plugin->handle == NULL) { @@ -287,11 +283,7 @@ purple_debug_error("plugins", "%s is not loadable: %s\n", plugin->path, plugin->error); } -#if GLIB_CHECK_VERSION(2,3,3) plugin->handle = g_module_open(filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); -#else - plugin->handle = g_module_open(filename, G_MODULE_BIND_LAZY); -#endif if (plugin->handle == NULL) {
--- a/libpurple/plugins/autoaccept.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/plugins/autoaccept.c Sat Oct 03 21:31:14 2009 +0000 @@ -28,13 +28,7 @@ /* System headers */ #include <glib.h> -#if GLIB_CHECK_VERSION(2,6,0) -# include <glib/gstdio.h> -#else -# include <sys/types.h> -# include <sys/stat.h> -# define g_mkdir mkdir -#endif +#include <glib/gstdio.h> /* Purple headers */ #include <plugin.h>
--- a/libpurple/protocols/jabber/jingle/session.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/session.c Sat Oct 03 21:31:14 2009 +0000 @@ -367,7 +367,6 @@ g_hash_table_lookup(js->sessions, sid) : NULL; } -#if GLIB_CHECK_VERSION(2,4,0) static gboolean find_by_jid_ghr(gpointer key, gpointer value, gpointer user_data) { @@ -387,58 +386,12 @@ return FALSE; } -#else /* GLIB_CHECK_VERSION 2.4.0 */ - -/* Ugly code; g_hash_table_find version above is much nicer */ -struct session_find_jid -{ - const gchar *jid; - JingleSession *ret; - gboolean use_bare; -}; - -static void find_by_jid_ghr(gpointer key, gpointer value, gpointer user_data) -{ - JingleSession *session = (JingleSession *)value; - struct session_find_jid *data = user_data; - gchar *remote_jid; - gchar *cmp_jid; - - if (data->ret != NULL) - return; - - remote_jid = jingle_session_get_remote_jid(session); - cmp_jid = data->use_bare ? jabber_get_bare_jid(remote_jid) - : g_strdup(remote_jid); - g_free(remote_jid); - - if (g_str_equal(data->jid, cmp_jid)) - data->ret = session; - - g_free(cmp_jid); -} -#endif /* GLIB_CHECK_VERSION 2.4.0 */ - JingleSession * jingle_session_find_by_jid(JabberStream *js, const gchar *jid) { -#if GLIB_CHECK_VERSION(2,4,0) return js->sessions != NULL ? g_hash_table_find(js->sessions, find_by_jid_ghr, (gpointer)jid) : NULL; -#else - struct session_find_jid data; - - if (js->sessions == NULL) - return NULL; - - data.jid = jid; - data.ret = NULL; - data.use_bare = g_utf8_strchr(jid, -1, '/') == NULL; - - g_hash_table_foreach(js->sessions, find_by_jid_ghr, &data); - return data.ret; -#endif } static xmlnode *
--- a/libpurple/protocols/jabber/si.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Oct 03 21:31:14 2009 +0000 @@ -853,8 +853,11 @@ /* If we successfully started listening locally */ if (sock >= 0) { gchar *jid; - const char *local_ip, *public_ip; - + GList *local_ips = + purple_network_get_all_local_system_ips(); + const char *public_ip; + gboolean has_public_ip = FALSE; + jsx->local_streamhost_fd = sock; jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node, @@ -862,19 +865,24 @@ xfer->local_port = purple_network_get_port_from_fd(sock); g_snprintf(port, sizeof(port), "%hu", xfer->local_port); - /* Include the localhost's IP (for in-network transfers) */ - local_ip = purple_network_get_local_system_ip(jsx->js->fd); - if (strcmp(local_ip, "0.0.0.0") != 0) { + public_ip = purple_network_get_my_ip(jsx->js->fd); + + /* Include the localhost's IPs (for in-network transfers) */ + while (local_ips) { + gchar *local_ip = local_ips->data; streamhost_count++; streamhost = xmlnode_new_child(query, "streamhost"); xmlnode_set_attrib(streamhost, "jid", jid); xmlnode_set_attrib(streamhost, "host", local_ip); xmlnode_set_attrib(streamhost, "port", port); + if (purple_strequal(local_ip, public_ip)) + has_public_ip = TRUE; + g_free(local_ip); + local_ips = g_list_delete_link(local_ips, local_ips); } /* Include the public IP (assuming that there is a port mapped somehow) */ - public_ip = purple_network_get_my_ip(jsx->js->fd); - if (strcmp(public_ip, local_ip) != 0 && strcmp(public_ip, "0.0.0.0") != 0) { + if (!has_public_ip && strcmp(public_ip, "0.0.0.0") != 0) { streamhost_count++; streamhost = xmlnode_new_child(query, "streamhost"); xmlnode_set_attrib(streamhost, "jid", jid);
--- a/libpurple/protocols/msn/nexus.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/protocols/msn/nexus.c Sat Oct 03 21:31:14 2009 +0000 @@ -244,15 +244,6 @@ gpointer data; }; -#if !GLIB_CHECK_VERSION(2, 12, 0) -static gboolean -nexus_remove_all_cb(gpointer key, gpointer val, gpointer data) -{ - return TRUE; -} -#endif - - static gboolean nexus_parse_token(MsnNexus *nexus, int id, xmlnode *node) { @@ -281,12 +272,7 @@ if (token_str == NULL) return FALSE; -#if GLIB_CHECK_VERSION(2, 12, 0) g_hash_table_remove_all(nexus->tokens[id].token); -#else - g_hash_table_foreach_remove(nexus->tokens[id].token, - nexus_remove_all_cb, NULL); -#endif elems = g_strsplit(token_str, "&", 0);
--- a/libpurple/protocols/msn/state.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/protocols/msn/state.c Sat Oct 03 21:31:14 2009 +0000 @@ -114,11 +114,7 @@ * 6: Album * 7: ? */ -#if GLIB_CHECK_VERSION(2,6,0) strings = g_strv_length(cmedia_array); -#else - while (cmedia_array[++strings] != NULL); -#endif if (strings >= 4 && !strcmp(cmedia_array[2], "1")) { parsed = TRUE;
--- a/libpurple/protocols/yahoo/libymsg.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Sat Oct 03 21:31:14 2009 +0000 @@ -1686,11 +1686,8 @@ char *crumb = NULL; char *crypt = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if (totalelements >= 4) { response_no = strtol(split_data[0], NULL, 10); crumb = g_strdup(split_data[1] + strlen("crumb=")); @@ -1772,11 +1769,8 @@ int response_no = -1; char *token = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if(totalelements == 1) response_no = strtol(split_data[0], NULL, 10); else if(totalelements >= 2) {
--- a/libpurple/util.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/util.c Sat Oct 03 21:31:14 2009 +0000 @@ -220,50 +220,12 @@ gchar * purple_base64_encode(const guchar *data, gsize len) { -#if GLIB_CHECK_VERSION(2,12,0) return g_base64_encode(data, len); -#else - char *out, *rv; - - g_return_val_if_fail(data != NULL, NULL); - g_return_val_if_fail(len > 0, NULL); - - rv = out = g_malloc(((len/3)+1)*4 + 1); - - for (; len >= 3; len -= 3) - { - *out++ = alphabet[data[0] >> 2]; - *out++ = alphabet[((data[0] << 4) & 0x30) | (data[1] >> 4)]; - *out++ = alphabet[((data[1] << 2) & 0x3c) | (data[2] >> 6)]; - *out++ = alphabet[data[2] & 0x3f]; - data += 3; - } - - if (len > 0) - { - unsigned char fragment; - - *out++ = alphabet[data[0] >> 2]; - fragment = (data[0] << 4) & 0x30; - - if (len > 1) - fragment |= data[1] >> 4; - - *out++ = alphabet[fragment]; - *out++ = (len < 2) ? '=' : alphabet[(data[1] << 2) & 0x3c]; - *out++ = '='; - } - - *out = '\0'; - - return rv; -#endif /* GLIB < 2.12.0 */ } guchar * purple_base64_decode(const char *str, gsize *ret_len) { -#if GLIB_CHECK_VERSION(2,12,0) /* * We want to allow ret_len to be NULL for backward compatibility, * but g_base64_decode() requires a valid length variable. So if @@ -271,69 +233,6 @@ */ gsize unused; return g_base64_decode(str, ret_len != NULL ? ret_len : &unused); -#else - guchar *out = NULL; - char tmp = 0; - const char *c; - gint32 tmp2 = 0; - int len = 0, n = 0; - - g_return_val_if_fail(str != NULL, NULL); - - c = str; - - while (*c) { - if (*c >= 'A' && *c <= 'Z') { - tmp = *c - 'A'; - } else if (*c >= 'a' && *c <= 'z') { - tmp = 26 + (*c - 'a'); - } else if (*c >= '0' && *c <= 57) { - tmp = 52 + (*c - '0'); - } else if (*c == '+') { - tmp = 62; - } else if (*c == '/') { - tmp = 63; - } else if (*c == '\r' || *c == '\n') { - c++; - continue; - } else if (*c == '=') { - if (n == 3) { - out = g_realloc(out, len + 2); - out[len] = (guchar)(tmp2 >> 10) & 0xff; - len++; - out[len] = (guchar)(tmp2 >> 2) & 0xff; - len++; - } else if (n == 2) { - out = g_realloc(out, len + 1); - out[len] = (guchar)(tmp2 >> 4) & 0xff; - len++; - } - break; - } - tmp2 = ((tmp2 << 6) | (tmp & 0xff)); - n++; - if (n == 4) { - out = g_realloc(out, len + 3); - out[len] = (guchar)((tmp2 >> 16) & 0xff); - len++; - out[len] = (guchar)((tmp2 >> 8) & 0xff); - len++; - out[len] = (guchar)(tmp2 & 0xff); - len++; - tmp2 = 0; - n = 0; - } - c++; - } - - out = g_realloc(out, len + 1); - out[len] = 0; - - if (ret_len != NULL) - *ret_len = len; - - return out; -#endif /* GLIB < 2.12.0 */ } /************************************************************************** @@ -2656,56 +2555,7 @@ int purple_build_dir (const char *path, int mode) { -#if GLIB_CHECK_VERSION(2,8,0) return g_mkdir_with_parents(path, mode); -#else - char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' }; - int cur, len; - - g_return_val_if_fail(path != NULL, -1); - - dir = g_new0(char, strlen(path) + 1); - components = g_strsplit(path, delim, -1); - len = 0; - for (cur = 0; components[cur] != NULL; cur++) { - /* If you don't know what you're doing on both - * win32 and *NIX, stay the hell away from this code */ - if(cur > 1) - dir[len++] = G_DIR_SEPARATOR; - strcpy(dir + len, components[cur]); - len += strlen(components[cur]); - if(cur == 0) - dir[len++] = G_DIR_SEPARATOR; - - if(g_file_test(dir, G_FILE_TEST_IS_DIR)) { - continue; -#ifdef _WIN32 - /* allow us to create subdirs on UNC paths - * (\\machinename\path\to\blah) - * g_file_test() doesn't work on "\\machinename" */ - } else if (cur == 2 && dir[0] == '\\' && dir[1] == '\\' - && components[cur + 1] != NULL) { - continue; -#endif - } else if(g_file_test(dir, G_FILE_TEST_EXISTS)) { - purple_debug_warning("build_dir", "bad path: %s\n", path); - g_strfreev(components); - g_free(dir); - return -1; - } - - if (g_mkdir(dir, mode) < 0) { - purple_debug_warning("build_dir", "mkdir: %s\n", g_strerror(errno)); - g_strfreev(components); - g_free(dir); - return -1; - } - } - - g_strfreev(components); - g_free(dir); - return 0; -#endif } /* @@ -3218,30 +3068,13 @@ gboolean purple_str_has_prefix(const char *s, const char *p) { -#if GLIB_CHECK_VERSION(2,2,0) return g_str_has_prefix(s, p); -#else - g_return_val_if_fail(s != NULL, FALSE); - g_return_val_if_fail(p != NULL, FALSE); - - return (!strncmp(s, p, strlen(p))); -#endif } gboolean purple_str_has_suffix(const char *s, const char *x) { -#if GLIB_CHECK_VERSION(2,2,0) return g_str_has_suffix(s, x); -#else - int off; - - g_return_val_if_fail(s != NULL, FALSE); - g_return_val_if_fail(x != NULL, FALSE); - - off = strlen(s) - strlen(x); - return (off >= 0 && purple_strequal(s + off, x)); -#endif } char * @@ -5138,18 +4971,5 @@ const gchar * purple_get_host_name(void) { -#if GLIB_CHECK_VERSION(2,8,0) return g_get_host_name(); -#else - static char hostname[256]; - int ret = gethostname(hostname, sizeof(hostname)); - hostname[sizeof(hostname) - 1] = '\0'; - - if (ret == -1 || hostname[0] == '\0') { - purple_debug_info("purple_get_host_name: ", "could not find host name"); - return "localhost"; - } else { - return hostname; - } -#endif }
--- a/libpurple/win32/libc_interface.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/win32/libc_interface.c Sat Oct 03 21:31:14 2009 +0000 @@ -469,65 +469,7 @@ /* stdio.h */ int wpurple_rename (const char *oldname, const char *newname) { - -#if GLIB_CHECK_VERSION(2,8,5) - return g_rename(oldname, newname); - -#else - - /* This is a ugly, but we still compile with 2.6.10 but use newer runtimes */ - struct stat oldstat, newstat; - - /* As of Glib 2.8.5, g_rename() uses MoveFileEx() with MOVEFILE_REPLACE_EXISTING to behave more sanely */ - if (glib_check_version(2, 8, 5) == NULL) { - return g_rename(oldname, newname); - } - - if(g_stat(oldname, &oldstat) == 0) { - /* newname exists */ - if(g_stat(newname, &newstat) == 0) { - /* oldname is a dir */ - if(S_ISDIR(oldstat.st_mode)) { - if(!S_ISDIR(newstat.st_mode)) { - return g_rename(oldname, newname); - } - /* newname is a dir */ - else { - /* This is not quite right.. If newname is empty and - is not a sub dir of oldname, newname should be - deleted and oldname should be renamed. - */ - purple_debug(PURPLE_DEBUG_WARNING, "wpurple", "wpurple_rename does not behave here as it should\n"); - return g_rename(oldname, newname); - } - } - /* oldname is not a dir */ - else { - /* newname is a dir */ - if(S_ISDIR(newstat.st_mode)) { - errno = EISDIR; - return -1; - } - /* newname is not a dir */ - else { - g_remove(newname); - return g_rename(oldname, newname); - } - } - } - /* newname doesn't exist */ - else - return g_rename(oldname, newname); - } - else { - /* oldname doesn't exist */ - errno = ENOENT; - return -1; - } - -#endif - } /* time.h */ @@ -1129,54 +1071,7 @@ wpurple_g_access (const gchar *filename, int mode) { -#if GLIB_CHECK_VERSION(2,8,0) - return g_access(filename, mode); - -#else - - if (G_WIN32_HAVE_WIDECHAR_API ()) - { - wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); - int retval; - int save_errno; - - if (wfilename == NULL) - { - errno = EINVAL; - return -1; - } - - retval = _waccess (wfilename, mode); - save_errno = errno; - - g_free (wfilename); - - errno = save_errno; - return retval; - } - else - { - gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); - int retval; - int save_errno; - - if (cp_filename == NULL) - { - errno = EINVAL; - return -1; - } - - retval = access (cp_filename, mode); - save_errno = errno; - - g_free (cp_filename); - - errno = save_errno; - return retval; - } - -#endif }
--- a/libpurple/win32/libc_interface.h Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/win32/libc_interface.h Sat Oct 03 21:31:14 2009 +0000 @@ -115,11 +115,6 @@ #define close( fd ) \ wpurple_close( fd ) -#if !GLIB_CHECK_VERSION(2,8,0) -#define g_access( filename, mode) \ -wpurple_g_access( filename, mode ) -#endif - #ifndef sleep #define sleep(x) Sleep((x)*1000) #endif @@ -140,14 +135,12 @@ #define rename( oldname, newname ) \ wpurple_rename( oldname, newname ) -#if GLIB_CHECK_VERSION(2,6,0) #ifdef g_rename # undef g_rename #endif /* This is necessary because we want rename on win32 to be able to overwrite an existing file, it is done in internal.h if GLib < 2.6*/ #define g_rename(oldname, newname) \ wpurple_rename(oldname, newname) -#endif /* sys/stat.h */ #define fchmod(a,b)
--- a/libpurple/win32/libc_internal.h Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/win32/libc_internal.h Sat Oct 03 21:31:14 2009 +0000 @@ -141,10 +141,6 @@ int wpurple_gethostname(char *name, size_t size); -#if !GLIB_CHECK_VERSION(2,8,0) -int wpurple_g_access(const gchar *filename, int mode); -#endif - /* stdio.h */ int wpurple_rename(const char *oldname, const char *newname);
--- a/libpurple/win32/win32dep.c Sat Oct 03 21:30:52 2009 +0000 +++ b/libpurple/win32/win32dep.c Sat Oct 03 21:31:14 2009 +0000 @@ -115,7 +115,6 @@ /* Get paths to special Windows folders. */ gchar *wpurple_get_special_folder(int folder_type) { - static LPFNSHGETFOLDERPATHA MySHGetFolderPathA = NULL; static LPFNSHGETFOLDERPATHW MySHGetFolderPathW = NULL; gchar *retval = NULL; @@ -133,21 +132,6 @@ } } - if (!retval) { - if (!MySHGetFolderPathA) { - MySHGetFolderPathA = (LPFNSHGETFOLDERPATHA) - wpurple_find_and_loadproc("shfolder.dll", "SHGetFolderPathA"); - } - if (MySHGetFolderPathA) { - char locale_dir[MAX_PATH + 1]; - - if (SUCCEEDED(MySHGetFolderPathA(NULL, folder_type, NULL, - SHGFP_TYPE_CURRENT, locale_dir))) { - retval = g_locale_to_utf8(locale_dir, -1, NULL, NULL, NULL); - } - } - } - return retval; } @@ -156,20 +140,11 @@ if (!initialized) { char *tmp = NULL; - if (G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t winstall_dir[MAXPATHLEN]; - if (GetModuleFileNameW(NULL, winstall_dir, - MAXPATHLEN) > 0) { - tmp = g_utf16_to_utf8(winstall_dir, -1, - NULL, NULL, NULL); - } - } else { - gchar cpinstall_dir[MAXPATHLEN]; - if (GetModuleFileNameA(NULL, cpinstall_dir, - MAXPATHLEN) > 0) { - tmp = g_locale_to_utf8(cpinstall_dir, - -1, NULL, NULL, NULL); - } + wchar_t winstall_dir[MAXPATHLEN]; + if (GetModuleFileNameW(NULL, winstall_dir, + MAXPATHLEN) > 0) { + tmp = g_utf16_to_utf8(winstall_dir, -1, + NULL, NULL, NULL); } if (tmp == NULL) { @@ -246,61 +221,33 @@ HKEY reg_key; gboolean success = FALSE; - if(G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, - NULL, NULL); - - if(RegOpenKeyExW(rootkey, wc_subkey, 0, - KEY_SET_VALUE, ®_key) == ERROR_SUCCESS) { - wchar_t *wc_valname = NULL; - - if (valname) - wc_valname = g_utf8_to_utf16(valname, -1, - NULL, NULL, NULL); + wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, + NULL, NULL); - if(value) { - wchar_t *wc_value = g_utf8_to_utf16(value, -1, - NULL, NULL, NULL); - int len = (wcslen(wc_value) * sizeof(wchar_t)) + 1; - if(RegSetValueExW(reg_key, wc_valname, 0, REG_SZ, - (LPBYTE)wc_value, len - ) == ERROR_SUCCESS) - success = TRUE; - g_free(wc_value); - } else - if(RegDeleteValueW(reg_key, wc_valname) == ERROR_SUCCESS) - success = TRUE; + if(RegOpenKeyExW(rootkey, wc_subkey, 0, + KEY_SET_VALUE, ®_key) == ERROR_SUCCESS) { + wchar_t *wc_valname = NULL; + + if (valname) + wc_valname = g_utf8_to_utf16(valname, -1, + NULL, NULL, NULL); - g_free(wc_valname); - } - g_free(wc_subkey); - } else { - char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL, - NULL, NULL); - if(RegOpenKeyExA(rootkey, cp_subkey, 0, - KEY_SET_VALUE, ®_key) == ERROR_SUCCESS) { - char *cp_valname = NULL; - if(valname) - cp_valname = g_locale_from_utf8(valname, -1, - NULL, NULL, NULL); + if(value) { + wchar_t *wc_value = g_utf8_to_utf16(value, -1, + NULL, NULL, NULL); + int len = (wcslen(wc_value) * sizeof(wchar_t)) + 1; + if(RegSetValueExW(reg_key, wc_valname, 0, REG_SZ, + (LPBYTE)wc_value, len + ) == ERROR_SUCCESS) + success = TRUE; + g_free(wc_value); + } else + if(RegDeleteValueW(reg_key, wc_valname) == ERROR_SUCCESS) + success = TRUE; - if (value) { - char *cp_value = g_locale_from_utf8(value, -1, - NULL, NULL, NULL); - int len = strlen(cp_value) + 1; - if(RegSetValueExA(reg_key, cp_valname, 0, REG_SZ, - cp_value, len - ) == ERROR_SUCCESS) - success = TRUE; - g_free(cp_value); - } else - if(RegDeleteValueA(reg_key, cp_valname) == ERROR_SUCCESS) - success = TRUE; - - g_free(cp_valname); - } - g_free(cp_subkey); + g_free(wc_valname); } + g_free(wc_subkey); if(reg_key != NULL) RegCloseKey(reg_key); @@ -312,17 +259,11 @@ HKEY reg_key = NULL; LONG rv; - if(G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, - NULL, NULL); - rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, ®_key); - g_free(wc_subkey); - } else { - char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL, - NULL, NULL); - rv = RegOpenKeyExA(rootkey, cp_subkey, 0, access, ®_key); - g_free(cp_subkey); - } + wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, + NULL, NULL); + rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, ®_key); + + g_free(wc_subkey); if (rv != ERROR_SUCCESS) { char *errmsg = g_win32_error_message(rv); @@ -340,19 +281,11 @@ static gboolean _reg_read(HKEY reg_key, const char *valname, LPDWORD type, LPBYTE data, LPDWORD data_len) { LONG rv; - if(G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_valname = NULL; - if (valname) - wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL); - rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len); - g_free(wc_valname); - } else { - char *cp_valname = NULL; - if(valname) - cp_valname = g_locale_from_utf8(valname, -1, NULL, NULL, NULL); - rv = RegQueryValueExA(reg_key, cp_valname, 0, type, data, data_len); - g_free(cp_valname); - } + wchar_t *wc_valname = NULL; + if (valname) + wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL); + rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len); + g_free(wc_valname); if (rv != ERROR_SUCCESS) { char *errmsg = g_win32_error_message(rv); @@ -389,24 +322,13 @@ if(reg_key) { if(_reg_read(reg_key, valname, &type, NULL, &nbytes) && type == REG_SZ) { - LPBYTE data; - if(G_WIN32_HAVE_WIDECHAR_API()) - data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1); - else - data = (LPBYTE) g_malloc(nbytes + 1); + LPBYTE data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1); if(_reg_read(reg_key, valname, &type, data, &nbytes)) { - if(G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_temp = (wchar_t*) data; - wc_temp[nbytes / sizeof(wchar_t)] = '\0'; - result = g_utf16_to_utf8(wc_temp, -1, - NULL, NULL, NULL); - } else { - char *cp_temp = (char*) data; - cp_temp[nbytes] = '\0'; - result = g_locale_to_utf8(cp_temp, -1, - NULL, NULL, NULL); - } + wchar_t *wc_temp = (wchar_t*) data; + wc_temp[nbytes / sizeof(wchar_t)] = '\0'; + result = g_utf16_to_utf8(wc_temp, -1, + NULL, NULL, NULL); } g_free(data); }
--- a/pidgin/Makefile.am Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/Makefile.am Sat Oct 03 21:31:14 2009 +0000 @@ -74,17 +74,12 @@ pidgin_SOURCES = \ eggtrayicon.c \ - pidgincombobox.c \ pidginstock.c \ gtkaccount.c \ gtkblist.c \ gtkblist-theme.c \ gtkblist-theme-loader.c \ - gtkcelllayout.c \ gtkcellrendererexpander.c \ - gtkcellrendererprogress.c \ - gtkcellview.c \ - gtkcellviewmenuitem.c \ gtkcertmgr.c \ gtkconn.c \ gtkconv.c \ @@ -94,7 +89,6 @@ gtkdocklet.c \ gtkdocklet-x11.c \ gtkeventloop.c \ - gtkexpander.c \ gtkft.c \ gtkicon-theme.c \ gtkicon-theme-loader.c \ @@ -135,13 +129,8 @@ gtkblist.h \ gtkblist-theme.h \ gtkblist-theme-loader.h \ - gtkcelllayout.h \ gtkcellrendererexpander.h \ - gtkcellrendererprogress.h \ - gtkcellview.h \ - gtkcellviewmenuitem.h \ gtkcertmgr.h \ - pidgincombobox.h \ gtkconn.h \ gtkconv.h \ gtkconvwin.h \ @@ -150,7 +139,6 @@ gtkdnd-hints.h \ gtkdocklet.h \ gtkeventloop.h \ - gtkexpander.h \ gtkft.h \ gtkicon-theme.h \ gtkicon-theme-loader.h \
--- a/pidgin/Makefile.mingw Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/Makefile.mingw Sat Oct 03 21:31:14 2009 +0000 @@ -58,9 +58,8 @@ gtkblist.c \ gtkblist-theme.c \ gtkblist-theme-loader.c \ + gtkcellrendererexpander.c \ gtkcertmgr.c \ - gtkcellrendererexpander.c \ - gtkcellrendererprogress.c \ gtkconn.c \ gtkconv.c \ gtkdebug.c \ @@ -68,7 +67,6 @@ gtkdnd-hints.c \ gtkdocklet.c \ gtkeventloop.c \ - gtkexpander.c \ gtkft.c \ gtkicon-theme.c \ gtkicon-theme-loader.c \
--- a/pidgin/gtkaccount.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkaccount.c Sat Oct 03 21:31:14 2009 +0000 @@ -462,9 +462,7 @@ /* Username */ dialog->username_entry = gtk_entry_new(); -#if GTK_CHECK_VERSION(2,10,0) g_object_set(G_OBJECT(dialog->username_entry), "truncate-multiline", TRUE, NULL); -#endif add_pref_box(dialog, vbox, _("_Username:"), dialog->username_entry); @@ -2069,25 +2067,12 @@ return ret; } -#if !GTK_CHECK_VERSION(2,2,0) -static void -get_selected_helper(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer user_data) -{ - *((gboolean *)user_data) = TRUE; -} -#endif - static void account_selected_cb(GtkTreeSelection *sel, AccountsWindow *dialog) { gboolean selected = FALSE; -#if GTK_CHECK_VERSION(2,2,0) selected = (gtk_tree_selection_count_selected_rows(sel) > 0); -#else - gtk_tree_selection_selected_foreach(sel, get_selected_helper, &selected); -#endif gtk_widget_set_sensitive(dialog->modify_button, selected); gtk_widget_set_sensitive(dialog->delete_button, selected);
--- a/pidgin/gtkblist.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkblist.c Sat Oct 03 21:31:14 2009 +0000 @@ -137,13 +137,9 @@ static struct pidgin_blist_sort_method *current_sort_method = NULL; static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); -/* The functions we use for sorting aren't available in gtk 2.0.x, and - * segfault in 2.2.0. 2.2.1 is known to work, so I'll require that */ -#if GTK_CHECK_VERSION(2,2,1) static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); -#endif static PidginBuddyList *gtkblist = NULL; static GList *groups_tree(void); @@ -201,7 +197,6 @@ static gboolean gtk_blist_window_state_cb(GtkWidget *w, GdkEventWindowState *event, gpointer data) { -#if GTK_CHECK_VERSION(2,2,0) if(event->changed_mask & GDK_WINDOW_STATE_WITHDRAWN) { if(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE); @@ -223,28 +218,6 @@ if (!(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)) pidgin_blist_refresh_timer(purple_get_blist()); } -#else - /* At least gtk+ 2.0.6 does not properly set the change_mask when unsetting a - * GdkWindowState flag. To work around, the window state will be explicitly - * queried on these older versions of gtk+. See pidgin ticket #739. - */ - GdkWindowState new_window_state = gdk_window_get_state(G_OBJECT(gtkblist->window->window)); - - if(new_window_state & GDK_WINDOW_STATE_WITHDRAWN) { - purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE); - } else { - purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", TRUE); - pidgin_blist_refresh_timer(purple_get_blist()); - } - - if(new_window_state & GDK_WINDOW_STATE_MAXIMIZED) - purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", TRUE); - else - purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE); - - if (!(new_window_state & GDK_WINDOW_STATE_ICONIFIED)) - pidgin_blist_refresh_timer(purple_get_blist()); -#endif return FALSE; } @@ -434,7 +407,6 @@ gtk_blist_join_chat(chat); } -#if GTK_CHECK_VERSION(2,6,0) static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list) { editing_blist = FALSE; @@ -480,7 +452,6 @@ } editing_blist = TRUE; } -#endif static void gtk_blist_do_personize(GList *merges) @@ -760,12 +731,8 @@ g_object_set(G_OBJECT(gtkblist->text_rend), "editable", TRUE, NULL); gtk_tree_view_set_enable_search (GTK_TREE_VIEW(gtkblist->treeview), FALSE); gtk_widget_grab_focus(gtkblist->treeview); -#if GTK_CHECK_VERSION(2,2,0) gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(gtkblist->treeview), path, gtkblist->text_column, gtkblist->text_rend, TRUE); -#else - gtk_tree_view_set_cursor(GTK_TREE_VIEW(gtkblist->treeview), path, gtkblist->text_column, TRUE); -#endif gtk_tree_path_free(path); } @@ -3062,7 +3029,6 @@ current_height-1,td->avatar_width+2, td->avatar_height+2); } -#if GTK_CHECK_VERSION(2,2,0) if (td->status_icon) { if (dir == GTK_TEXT_DIR_RTL) gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon, @@ -3089,16 +3055,6 @@ current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)), -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); -#else - if (td->status_icon) { - gdk_pixbuf_render_to_drawable(td->status_icon, GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, 12, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); - } - if(td->avatar) - gdk_pixbuf_render_to_drawable(td->avatar, - GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, - max_width - (td->avatar_width + TOOLTIP_BORDER), - current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); -#endif if (td->name_layout) { if (dir == GTK_TEXT_DIR_RTL) { gtk_paint_layout(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, @@ -3477,12 +3433,13 @@ /* Help */ { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, + { "/Help/sep1", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Help/_Build Information"), NULL, pidgin_dialogs_buildinfo, 0, "<Item>", NULL }, { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, -#if GTK_CHECK_VERSION(2,6,0) + { N_("/Help/De_veloper Information"), NULL, pidgin_dialogs_developers, 0, "<Item>", NULL }, + { N_("/Help/_Translator Information"), NULL, pidgin_dialogs_translators, 0, "<Item>", NULL }, + { "/Help/sep2", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Help/_About"), NULL, pidgin_dialogs_about, 4, "<StockItem>", GTK_STOCK_ABOUT }, -#else - { N_("/Help/_About"), NULL, pidgin_dialogs_about, 4, "<Item>", NULL }, -#endif }; /********************************************************* @@ -4072,44 +4029,11 @@ g_free(tmp); tmp = new; } - /* add ... to messages that are too long, GTK 2.6+ does it automatically */ -#if !GTK_CHECK_VERSION(2,6,0) - if(tmp) { - char buf[32]; - char *c = tmp; - int length = 0, vis=0; - gboolean inside = FALSE; - g_strdelimit(tmp, "\n", ' '); - purple_str_strip_char(tmp, '\r'); - - while(*c && vis < 20) { - if(*c == '&') - inside = TRUE; - else if(*c == ';') - inside = FALSE; - if(!inside) - vis++; - c = g_utf8_next_char(c); /* this is fun */ - } - - length = c - tmp; - - if(vis == 20) - g_snprintf(buf, sizeof(buf), "%%.%ds...", length); - else - g_snprintf(buf, sizeof(buf), "%%s "); - - statustext = g_strdup_printf(buf, tmp); - - g_free(tmp); - } -#else if(tmp) { g_strdelimit(tmp, "\n", ' '); purple_str_strip_char(tmp, '\r'); } statustext = tmp; -#endif } if(!purple_presence_is_online(presence) && !statustext) @@ -4662,11 +4586,9 @@ const char *id; pidgin_blist_sort_method_reg("none", _("Manually"), sort_method_none); -#if GTK_CHECK_VERSION(2,2,1) pidgin_blist_sort_method_reg("alphabetical", _("Alphabetically"), sort_method_alphabetical); pidgin_blist_sort_method_reg("status", _("By status"), sort_method_status); pidgin_blist_sort_method_reg("log_size", _("By recent log activity"), sort_method_log_activity); -#endif id = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type"); if (id == NULL) { @@ -4690,9 +4612,7 @@ } redo_buddy_list(purple_get_blist(), FALSE, FALSE); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview)); -#endif if (node) { @@ -4728,11 +4648,7 @@ /* this is far too ugly thanks to me not wanting to fix #3989 properly right now */ if (priv->error_scrollbook != NULL) { -#if GTK_CHECK_VERSION(2,2,0) errors = gtk_notebook_get_n_pages(GTK_NOTEBOOK(priv->error_scrollbook->notebook)); -#else - errors = g_list_length(GTK_NOTEBOOK(priv->error_scrollbook->notebook)->children); -#endif } if ((list = purple_accounts_get_all_active()) != NULL || errors) { gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 1); @@ -4809,23 +4725,11 @@ gdk_window_set_cursor(widget->window, gtkblist->hand_cursor); if (gtkblist->headline_close) { -#if GTK_CHECK_VERSION(2,2,0) gdk_draw_pixbuf(widget->window, NULL, gtkblist->headline_close, -#else - gdk_pixbuf_render_to_drawable(gtkblist->headline_close, - GDK_DRAWABLE(widget->window), NULL, -#endif 0, 0, widget->allocation.width - 2 - HEADLINE_CLOSE_SIZE, 2, HEADLINE_CLOSE_SIZE, HEADLINE_CLOSE_SIZE, GDK_RGB_DITHER_NONE, 0, 0); -#if 0 - /* The presence of one opening paren in each branch of - * GTK_CHECK_VERSION confuses vim's bracket matching for the - * rest of the file. - */ - ) -#endif gtk_paint_focus(widget->style, widget->window, GTK_STATE_PRELIGHT, NULL, widget, NULL, widget->allocation.width - HEADLINE_CLOSE_SIZE - 3, 1, @@ -5184,9 +5088,7 @@ gtk_label_set_markup(GTK_LABEL(label), markup); g_free(markup); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); -#if GTK_CHECK_VERSION(2,6,0) g_object_set(G_OBJECT(label), "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif #if GTK_CHECK_VERSION(2,12,0) { /* avoid unused variable warnings on pre-2.12 Gtk */ char *description = @@ -5389,12 +5291,7 @@ return; tooltips = gtk_tooltips_new (); -#if GLIB_CHECK_VERSION(2,10,0) g_object_ref_sink (tooltips); -#else - g_object_ref(tooltips); - gtk_object_sink(GTK_OBJECT(tooltips)); -#endif gtk_tooltips_force_window (tooltips); #if GTK_CHECK_VERSION(2, 12, 0) @@ -5502,10 +5399,8 @@ gtk_tree_view_column_set_attributes(column, rend, "visible", GROUP_EXPANDER_VISIBLE_COLUMN, "expander-visible", GROUP_EXPANDER_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "sensitive", GROUP_EXPANDER_COLUMN, "cell-background-gdk", BGCOLOR_COLUMN, -#endif NULL); /* contact */ @@ -5514,10 +5409,8 @@ gtk_tree_view_column_set_attributes(column, rend, "visible", CONTACT_EXPANDER_VISIBLE_COLUMN, "expander-visible", CONTACT_EXPANDER_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "sensitive", CONTACT_EXPANDER_COLUMN, "cell-background-gdk", BGCOLOR_COLUMN, -#endif NULL); for (i = 0; i < 5; i++) { @@ -5529,9 +5422,7 @@ gtk_tree_view_column_set_attributes(column, rend, "pixbuf", STATUS_ICON_COLUMN, "visible", STATUS_ICON_VISIBLE_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif NULL); g_object_set(rend, "xalign", 0.0, "xpad", 6, "ypad", 0, NULL); @@ -5540,20 +5431,14 @@ gtkblist->text_rend = rend = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, rend, TRUE); gtk_tree_view_column_set_attributes(column, rend, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif "markup", NAME_COLUMN, NULL); -#if GTK_CHECK_VERSION(2,6,0) g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL); g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list); -#endif g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list); g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL); -#if GTK_CHECK_VERSION(2,6,0) g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif /* idle */ rend = gtk_cell_renderer_text_new(); @@ -5562,9 +5447,7 @@ gtk_tree_view_column_set_attributes(column, rend, "markup", IDLE_COLUMN, "visible", IDLE_VISIBLE_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif NULL); } else if (emblem == i) { /* emblem */ @@ -5572,9 +5455,7 @@ g_object_set(rend, "xalign", 1.0, "yalign", 0.5, "ypad", 0, "xpad", 3, NULL); gtk_tree_view_column_pack_start(column, rend, FALSE); gtk_tree_view_column_set_attributes(column, rend, "pixbuf", EMBLEM_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif "visible", EMBLEM_VISIBLE_COLUMN, NULL); } else if (protocol_icon == i) { @@ -5584,9 +5465,7 @@ gtk_tree_view_column_set_attributes(column, rend, "pixbuf", PROTOCOL_ICON_COLUMN, "visible", PROTOCOL_ICON_VISIBLE_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif NULL); g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL); @@ -5596,9 +5475,7 @@ g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL); gtk_tree_view_column_pack_start(column, rend, FALSE); gtk_tree_view_column_set_attributes(column, rend, "pixbuf", BUDDY_ICON_COLUMN, -#if GTK_CHECK_VERSION(2,6,0) "cell-background-gdk", BGCOLOR_COLUMN, -#endif "visible", BUDDY_ICON_VISIBLE_COLUMN, NULL); } @@ -6739,9 +6616,6 @@ return; } -#if !GTK_CHECK_VERSION(2,6,0) - gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview)); -#endif } static void pidgin_blist_destroy(PurpleBuddyList *list) @@ -7540,8 +7414,6 @@ sibling ? &sibling_iter : NULL); } -#if GTK_CHECK_VERSION(2,2,1) - static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) { GtkTreeIter more_z; @@ -7785,8 +7657,6 @@ } } -#endif - static void plugin_act(GtkObject *obj, PurplePluginAction *pam) {
--- a/pidgin/gtkcelllayout.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,283 +0,0 @@ -/* gtkcelllayout.c - * Copyright (C) 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -/* -#include <config.h> -*/ -#include <gtk/gtkversion.h> -#if !GTK_CHECK_VERSION(2,4,0) -#include "gtkcelllayout.h" - -GType -gtk_cell_layout_get_type (void) -{ - static GType cell_layout_type = 0; - - if (! cell_layout_type) - { - static const GTypeInfo cell_layout_info = - { - sizeof (GtkCellLayoutIface), - NULL, - NULL, - NULL, - NULL, - NULL, - 0, - 0, - NULL - }; - - cell_layout_type = - g_type_register_static (G_TYPE_INTERFACE, "PidginCellLayout", - &cell_layout_info, 0); - - g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT); - } - - return cell_layout_type; -} - -/** - * gtk_cell_layout_pack_start: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer. - * @expand: %TRUE if @cell is to be given extra space allocated to @cell_layout. - * - * Packs the @cell into the beginning of @cell_layout. If @expand is %FALSE, - * then the @cell is allocated no more space than it needs. Any unused space - * is divided evenly between cells for which @expand is %TRUE. - * - * Since: 2.4 - */ -void -gtk_cell_layout_pack_start (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->pack_start) (cell_layout, - cell, - expand); -} - -/** - * gtk_cell_layout_pack_end: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer. - * @expand: %TRUE if @cell is to be given extra space allocated to @cell_layout. - * - * Adds the @cell to the end of @cell_layout. If @expand is %FALSE, then the - * @cell is allocated no more space than it needs. Any unused space is - * divided evenly between cells for which @expand is %TRUE. - * - * Since: 2.4 - */ -void -gtk_cell_layout_pack_end (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->pack_end) (cell_layout, - cell, - expand); -} - -/** - * gtk_cell_layout_clear: - * @cell_layout: A #GtkCellLayout. - * - * Unsets all the mappings on all renderers on @cell_layout and - * removes all renderers from @cell_layout. - * - * Since: 2.4 - */ -void -gtk_cell_layout_clear (GtkCellLayout *cell_layout) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->clear) (cell_layout); -} - -static void -gtk_cell_layout_set_attributesv (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - va_list args) -{ - gchar *attribute; - gint column; - GtkCellLayoutIface *iface; - - attribute = va_arg (args, gchar *); - - iface = GTK_CELL_LAYOUT_GET_IFACE (cell_layout); - - (* iface->clear_attributes) (cell_layout, cell); - - while (attribute != NULL) - { - column = va_arg (args, gint); - (* iface->add_attribute) (cell_layout, cell, attribute, column); - attribute = va_arg (args, gchar *); - } -} - -/** - * gtk_cell_layout_set_attributes: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer. - * @Varargs: A %NULL-terminated list of attributes. - * - * Sets the attributes in list as the attributes of @cell_layout. The - * attributes should be in attribute/column order, as in - * gtk_cell_layout_add_attribute(). All existing attributes are removed, and - * replaced with the new attributes. - * - * Since: 2.4 - */ -void -gtk_cell_layout_set_attributes (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - ...) -{ - va_list args; - - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - va_start (args, cell); - gtk_cell_layout_set_attributesv (cell_layout, cell, args); - va_end (args); -} - -/** - * gtk_cell_layout_add_attribute: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer. - * @attribute: An attribute on the renderer. - * @column: The column position on the model to get the attribute from. - * - * Adds an attribute mapping to the list in @cell_layout. The @column is the - * column of the model to get a value from, and the @attribute is the - * parameter on @cell to be set from the value. So for example if column 2 - * of the model contains strings, you could have the "text" attribute of a - * #GtkCellRendererText get its values from column 2. - * - * Since: 2.4 - */ -void -gtk_cell_layout_add_attribute (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - const gchar *attribute, - gint column) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - g_return_if_fail (attribute != NULL); - g_return_if_fail (column >= 0); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->add_attribute) (cell_layout, - cell, - attribute, - column); -} - -/** - * gtk_cell_layout_set_cell_data_func: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer. - * @func: The #GtkCellLayoutDataFunc to use. - * @func_data: The user data for @func. - * @destroy: The destroy notification for @func_data. - * - * Sets the #GtkCellLayoutDataFunc to use for @cell_layout. This function - * is used instead of the standard attributes mapping for setting the - * column value, and should set the value of @cell_layout's cell renderer(s) - * as appropriate. @func may be %NULL to remove and older one. - * - * Since: 2.4 - */ -void -gtk_cell_layout_set_cell_data_func (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->set_cell_data_func) (cell_layout, - cell, - func, - func_data, - destroy); -} - -/** - * gtk_cell_layout_clear_attributes: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer to clear the attribute mapping on. - * - * Clears all existing attributes previously set with - * gtk_cell_layout_set_attributes(). - * - * Since: 2.4 - */ -void -gtk_cell_layout_clear_attributes (GtkCellLayout *cell_layout, - GtkCellRenderer *cell) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->clear_attributes) (cell_layout, - cell); -} - -/** - * gtk_cell_layout_reorder: - * @cell_layout: A #GtkCellLayout. - * @cell: A #GtkCellRenderer to reorder. - * @position: New position to insert @cell at. - * - * Re-inserts @cell at @position. Note that @cell has already to be packed - * into @cell_layout for this to function properly. - * - * Since: 2.4 - */ -void -gtk_cell_layout_reorder (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gint position) -{ - g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->reorder) (cell_layout, - cell, - position); -} -#endif /* Gtk 2.4 */
--- a/pidgin/gtkcelllayout.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* gtkcelllayout.h - * Copyright (C) 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -#ifndef __GTK_CELL_LAYOUT_H__ -#define __GTK_CELL_LAYOUT_H__ - -#include <glib-object.h> - -#include <gtk/gtkcellrenderer.h> -#include <gtk/gtktreeviewcolumn.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_CELL_LAYOUT (gtk_cell_layout_get_type ()) -#define GTK_CELL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayout)) -#define GTK_IS_CELL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_LAYOUT)) -#define GTK_CELL_LAYOUT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayoutIface)) - -typedef struct _GtkCellLayout GtkCellLayout; /* dummy typedef */ -typedef struct _GtkCellLayoutIface GtkCellLayoutIface; - -/* keep in sync with GtkTreeCellDataFunc */ -typedef void (* GtkCellLayoutDataFunc) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data); - -struct _GtkCellLayoutIface -{ - GTypeInterface g_iface; - - /* Virtual Table */ - void (* pack_start) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand); - void (* pack_end) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand); - void (* clear) (GtkCellLayout *cell_layout); - void (* add_attribute) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - const gchar *attribute, - gint column); - void (* set_cell_data_func) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy); - void (* clear_attributes) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell); - void (* reorder) (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gint position); -}; - -GType gtk_cell_layout_get_type (void); -void gtk_cell_layout_pack_start (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand); -void gtk_cell_layout_pack_end (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gboolean expand); -void gtk_cell_layout_clear (GtkCellLayout *cell_layout); -void gtk_cell_layout_set_attributes (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - ...); -void gtk_cell_layout_add_attribute (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - const gchar *attribute, - gint column); -void gtk_cell_layout_set_cell_data_func (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy); -void gtk_cell_layout_clear_attributes (GtkCellLayout *cell_layout, - GtkCellRenderer *cell); -void gtk_cell_layout_reorder (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - gint position); - - -G_END_DECLS - -#endif /* __GTK_CELL_LAYOUT_H__ */
--- a/pidgin/gtkcellrendererexpander.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkcellrendererexpander.c Sat Oct 03 21:31:14 2009 +0000 @@ -246,13 +246,8 @@ width = cell_area->width; height = cell_area->height; -#if GTK_CHECK_VERSION(2,6,0) if (!cell->sensitive) state = GTK_STATE_INSENSITIVE; -#else - if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE) - state = GTK_STATE_INSENSITIVE; -#endif else if (flags & GTK_CELL_RENDERER_PRELIT) state = GTK_STATE_PRELIGHT; else if (GTK_WIDGET_HAS_FOCUS (widget) && flags & GTK_CELL_RENDERER_SELECTED)
--- a/pidgin/gtkcellrendererprogress.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,296 +0,0 @@ -/* - * @file gtkcellrendererprogress.c GTK+ Cell Renderer Progress - * @ingroup pidgin - */ - -/* pidgin - * - * Pidgin is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - */ - -/* This is taken largely from GtkCellRenderer[Text|Pixbuf|Toggle] by - * Jonathon Blandford <jrb@redhat.com> for RedHat, Inc. - */ - -#include "gtkcellrendererprogress.h" - -static void pidgin_cell_renderer_progress_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); -static void pidgin_cell_renderer_progress_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void pidgin_cell_renderer_progress_init (PidginCellRendererProgress *cellprogress); -static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class); -static void pidgin_cell_renderer_progress_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height); -static void pidgin_cell_renderer_progress_render (GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags); -#if 0 -static gboolean pidgin_cell_renderer_progress_activate (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - guint flags); -#endif -static void pidgin_cell_renderer_progress_finalize (GObject *gobject); - -enum { - LAST_SIGNAL -}; - -enum { - PROP_0, - PROP_PERCENTAGE, - PROP_TEXT, - PROP_SHOW_TEXT -}; - -static gpointer parent_class; -/* static guint progress_cell_renderer_signals [LAST_SIGNAL]; */ - -GType pidgin_cell_renderer_progress_get_type (void) -{ - static GType cell_progress_type = 0; - - if (!cell_progress_type) - { - static const GTypeInfo cell_progress_info = - { - sizeof (PidginCellRendererProgressClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) pidgin_cell_renderer_progress_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginCellRendererProgress), - 0, /* n_preallocs */ - (GInstanceInitFunc) pidgin_cell_renderer_progress_init, - NULL /* value_table */ - }; - - cell_progress_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, - "PidginCellRendererProgress", - &cell_progress_info, 0); - } - - return cell_progress_type; -} - -static void pidgin_cell_renderer_progress_init (PidginCellRendererProgress *cellprogress) -{ - GTK_CELL_RENDERER(cellprogress)->mode = GTK_CELL_RENDERER_MODE_INERT; - GTK_CELL_RENDERER(cellprogress)->xpad = 2; - GTK_CELL_RENDERER(cellprogress)->ypad = 2; -} - -static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS(class); - GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class); - - parent_class = g_type_class_peek_parent (class); - object_class->finalize = pidgin_cell_renderer_progress_finalize; - - object_class->get_property = pidgin_cell_renderer_progress_get_property; - object_class->set_property = pidgin_cell_renderer_progress_set_property; - - cell_class->get_size = pidgin_cell_renderer_progress_get_size; - cell_class->render = pidgin_cell_renderer_progress_render; - - g_object_class_install_property (object_class, - PROP_PERCENTAGE, - g_param_spec_double ("percentage", - "Percentage", - "The fractional progress to display", - 0, 1, 0, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_TEXT, - g_param_spec_string ("text", - "Text", - "Text to overlay over progress bar", - NULL, - G_PARAM_READWRITE)); - g_object_class_install_property(object_class, - PROP_SHOW_TEXT, - g_param_spec_string("text_set", - "Text set", - "Whether to overlay text on the progress bar", - FALSE, - G_PARAM_READABLE | G_PARAM_WRITABLE)); -} - -static void pidgin_cell_renderer_progress_finalize (GObject *object) -{ -/* - PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object); -*/ - - (* G_OBJECT_CLASS (parent_class)->finalize) (object); -} - -static void pidgin_cell_renderer_progress_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *psec) -{ - PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object); - - switch (param_id) - { - case PROP_PERCENTAGE: - g_value_set_double(value, cellprogress->progress); - break; - case PROP_TEXT: - g_value_set_string(value, cellprogress->text); - break; - case PROP_SHOW_TEXT: - g_value_set_boolean(value, cellprogress->text_set); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, psec); - break; - } -} - -static void pidgin_cell_renderer_progress_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS (object); - - switch (param_id) - { - case PROP_PERCENTAGE: - cellprogress->progress = g_value_get_double(value); - break; - case PROP_TEXT: - if (cellprogress->text) - g_free(cellprogress->text); - cellprogress->text = g_strdup(g_value_get_string(value)); - g_object_notify(object, "text"); - break; - case PROP_SHOW_TEXT: - cellprogress->text_set = g_value_get_boolean(value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); - break; - } -} - -GtkCellRenderer *pidgin_cell_renderer_progress_new(void) -{ - return g_object_new(PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL); -} - -static void pidgin_cell_renderer_progress_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) -{ - gint calc_width; - gint calc_height; - - calc_width = (gint) cell->xpad * 2 + 50; - calc_height = (gint) cell->ypad * 2 + 12; - - if (width) - *width = calc_width; - - if (height) - *height = calc_height; - - if (cell_area) - { - if (x_offset) - { - *x_offset = cell->xalign * (cell_area->width - calc_width); - *x_offset = MAX (*x_offset, 0); - } - if (y_offset) - { - *y_offset = cell->yalign * (cell_area->height - calc_height); - *y_offset = MAX (*y_offset, 0); - } - } -} - - -static void pidgin_cell_renderer_progress_render (GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - guint flags) -{ - PidginCellRendererProgress *cellprogress = (PidginCellRendererProgress *) cell; - - gint width, height; - GtkStateType state; - - width = cell_area->width; - height = cell_area->height; - - if (GTK_WIDGET_HAS_FOCUS (widget)) - state = GTK_STATE_ACTIVE; - else - state = GTK_STATE_NORMAL; - - width -= cell->xpad*2; - height -= cell->ypad*2; - - gtk_paint_box (widget->style, - window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - NULL, widget, "trough", - cell_area->x + cell->xpad, - cell_area->y + cell->ypad, - width - 1, height - 1); - gtk_paint_box (widget->style, - window, - state, GTK_SHADOW_OUT, - NULL, widget, "bar", - cell_area->x + cell->xpad + 1, - cell_area->y + cell->ypad + 1, - (width - 3) * cellprogress->progress, - height - 3); -}
--- a/pidgin/gtkcellrendererprogress.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* gtkxcellrendererprogress.h - * Pidgin is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - */ -#ifndef _PIDGINCELLRENDERERPROGRESS_H_ -#define _PIDGINCELLRENDERERPROGRESS_H_ - -#include <gtk/gtk.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS (pidgin_cell_renderer_progress_get_type()) -#define PIDGIN_CELL_RENDERER_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgress)) -#define PIDGIN_CELL_RENDERER_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass)) -#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS)) -#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS)) -#define PIDGIN_CELL_RENDERER_PROGRESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass)) - -typedef struct _PidginCellRendererProgress PidginCellRendererProgress; -typedef struct _PidginCellRendererProgressClass PidginCellRendererProgressClass; - -struct _PidginCellRendererProgress { - GtkCellRenderer parent; - - gdouble progress; - gchar *text; - gboolean text_set; -}; - -struct _PidginCellRendererProgressClass { - GtkCellRendererClass parent_class; -}; - -GType pidgin_cell_renderer_progress_get_type (void); -GtkCellRenderer *pidgin_cell_renderer_progress_new (void); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _PIDGINCELLRENDERERPROGRESS_H_ */
--- a/pidgin/gtkcellview.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1002 +0,0 @@ -/* gtkellview.c - * Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -/* -#include <config.h> -*/ -#include "gtkcellview.h" -#include <gtk/gtkversion.h> -#if !GTK_CHECK_VERSION(2,6,0) -#if GTK_CHECK_VERSION(2,4,0) -#include <gtk/gtkcelllayout.h> -#else -#include "gtkcelllayout.h" -#endif -#include <gtk/gtksignal.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcellrendererpixbuf.h> -#include <gobject/gmarshal.h> - -#define P_(x) (x) - -typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo; -struct _GtkCellViewCellInfo -{ - GtkCellRenderer *cell; - - gint requested_width; - gint real_width; - guint expand : 1; - guint pack : 1; - - GSList *attributes; - - GtkCellLayoutDataFunc func; - gpointer func_data; - GDestroyNotify destroy; -}; - -struct _GtkCellViewPrivate -{ - GtkTreeModel *model; - GtkTreeRowReference *displayed_row; - GList *cell_list; - gint spacing; - - GdkColor background; - gboolean background_set; -}; - - -static void gtk_cell_view_class_init (GtkCellViewClass *klass); -static void gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface); -static void gtk_cell_view_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); -static void gtk_cell_view_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_cell_view_init (GtkCellView *cellview); -static void gtk_cell_view_finalize (GObject *object); -static void gtk_cell_view_style_set (GtkWidget *widget, - GtkStyle *previous_style); -static void gtk_cell_view_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_cell_view_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static gboolean gtk_cell_view_expose (GtkWidget *widget, - GdkEventExpose *event); -static void gtk_cell_view_set_valuesv (GtkCellView *cellview, - GtkCellRenderer *renderer, - va_list args); -static GtkCellViewCellInfo *gtk_cell_view_get_cell_info (GtkCellView *cellview, - GtkCellRenderer *renderer); -static void gtk_cell_view_set_cell_data (GtkCellView *cellview); - - -static void gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout, - GtkCellRenderer *renderer, - gboolean expand); -static void gtk_cell_view_cell_layout_pack_end (GtkCellLayout *layout, - GtkCellRenderer *renderer, - gboolean expand); -static void gtk_cell_view_cell_layout_add_attribute (GtkCellLayout *layout, - GtkCellRenderer *renderer, - const gchar *attribute, - gint column); -static void gtk_cell_view_cell_layout_clear (GtkCellLayout *layout); -static void gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout, - GtkCellRenderer *renderer); -static void gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout *layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy); -static void gtk_cell_view_cell_layout_reorder (GtkCellLayout *layout, - GtkCellRenderer *cell, - gint position); - - -enum -{ - PROP_0, - PROP_BACKGROUND, - PROP_BACKGROUND_GDK, - PROP_BACKGROUND_SET -}; - -static GtkObjectClass *parent_class = NULL; - - -GType -gtk_cell_view_get_type (void) -{ - static GType cell_view_type = 0; - - if (!cell_view_type) - { - static const GTypeInfo cell_view_info = - { - sizeof (GtkCellViewClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_cell_view_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkCellView), - 0, - (GInstanceInitFunc) gtk_cell_view_init - }; - - static const GInterfaceInfo cell_layout_info = - { - (GInterfaceInitFunc) gtk_cell_view_cell_layout_init, - NULL, - NULL - }; - - cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "PidginCellView", - &cell_view_info, 0); - - g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT, - &cell_layout_info); - } - - return cell_view_type; -} - -static void -gtk_cell_view_class_init (GtkCellViewClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->get_property = gtk_cell_view_get_property; - gobject_class->set_property = gtk_cell_view_set_property; - gobject_class->finalize = gtk_cell_view_finalize; - - widget_class->expose_event = gtk_cell_view_expose; - widget_class->size_allocate = gtk_cell_view_size_allocate; - widget_class->size_request = gtk_cell_view_size_request; - widget_class->style_set = gtk_cell_view_style_set; - - /* properties */ - g_object_class_install_property (gobject_class, - PROP_BACKGROUND, - g_param_spec_string ("background", - P_("Background color name"), - P_("Background color as a string"), - NULL, - G_PARAM_WRITABLE)); - g_object_class_install_property (gobject_class, - PROP_BACKGROUND_GDK, - g_param_spec_boxed ("background_gdk", - P_("Background color"), - P_("Background color as a GdkColor"), - GDK_TYPE_COLOR, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - -#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)) - - ADD_SET_PROP ("background_set", PROP_BACKGROUND_SET, - P_("Background set"), - P_("Whether this tag affects the background color")); -} - -static void -gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface) -{ - iface->pack_start = gtk_cell_view_cell_layout_pack_start; - iface->pack_end = gtk_cell_view_cell_layout_pack_end; - iface->clear = gtk_cell_view_cell_layout_clear; - iface->add_attribute = gtk_cell_view_cell_layout_add_attribute; - iface->set_cell_data_func = gtk_cell_view_cell_layout_set_cell_data_func; - iface->clear_attributes = gtk_cell_view_cell_layout_clear_attributes; - iface->reorder = gtk_cell_view_cell_layout_reorder; -} - -static void -gtk_cell_view_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - GtkCellView *view = GTK_CELL_VIEW (object); - - switch (param_id) - { - case PROP_BACKGROUND_GDK: - { - GdkColor color; - - color = view->priv->background; - - g_value_set_boxed (value, &color); - } - break; - case PROP_BACKGROUND_SET: - g_value_set_boolean (value, view->priv->background_set); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gtk_cell_view_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkCellView *view = GTK_CELL_VIEW (object); - - switch (param_id) - { - case PROP_BACKGROUND: - { - GdkColor color; - - if (!g_value_get_string (value)) - gtk_cell_view_set_background_color (view, NULL); - else if (gdk_color_parse (g_value_get_string (value), &color)) - gtk_cell_view_set_background_color (view, &color); - else - g_warning ("Don't know color `%s'", g_value_get_string (value)); - - g_object_notify (object, "background_gdk"); - } - break; - case PROP_BACKGROUND_GDK: - gtk_cell_view_set_background_color (view, g_value_get_boxed (value)); - break; - case PROP_BACKGROUND_SET: - view->priv->background_set = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gtk_cell_view_init (GtkCellView *cellview) -{ - GTK_WIDGET_SET_FLAGS (cellview, GTK_NO_WINDOW); - - cellview->priv = g_new0(GtkCellViewPrivate,1); -} - -static void -gtk_cell_view_style_set (GtkWidget *widget, - GtkStyle *previous_style) -{ - if (previous_style && GTK_WIDGET_REALIZED (widget)) - gdk_window_set_background (widget->window, - &widget->style->base[GTK_WIDGET_STATE (widget)]); -} - -static void -gtk_cell_view_finalize (GObject *object) -{ - GtkCellView *cellview = GTK_CELL_VIEW (object); - - gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (cellview)); - - if (cellview->priv->model) - g_object_unref (cellview->priv->model); - - if (cellview->priv->displayed_row) - gtk_tree_row_reference_free (cellview->priv->displayed_row); - - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); - - g_free (cellview->priv); -} - -static void -gtk_cell_view_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GList *i; - gboolean first_cell = TRUE; - GtkCellView *cellview; - - cellview = GTK_CELL_VIEW (widget); - - requisition->width = 0; - requisition->height = 0; - - if (cellview->priv->displayed_row) - gtk_cell_view_set_cell_data (cellview); - - for (i = cellview->priv->cell_list; i; i = i->next) - { - gint width, height; - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (!info->cell->visible) - continue; - - if (!first_cell) - requisition->width += cellview->priv->spacing; - - gtk_cell_renderer_get_size (info->cell, widget, NULL, NULL, NULL, - &width, &height); - - info->requested_width = width; - requisition->width += width; - requisition->height = MAX (requisition->height, height); - - first_cell = FALSE; - } -} - -static void -gtk_cell_view_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GList *i; - gint expand_cell_count = 0; - gint full_requested_width = 0; - gint extra_space; - GtkCellView *cellview; - - widget->allocation = *allocation; - - cellview = GTK_CELL_VIEW (widget); - - /* checking how much extra space we have */ - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (!info->cell->visible) - continue; - - if (info->expand) - expand_cell_count++; - - full_requested_width += info->requested_width; - } - - extra_space = widget->allocation.width - full_requested_width; - if (extra_space < 0) - extra_space = 0; - else if (extra_space > 0 && expand_cell_count > 0) - extra_space /= expand_cell_count; - - /* iterate list for PACK_START cells */ - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (info->pack == GTK_PACK_END) - continue; - - if (!info->cell->visible) - continue; - - info->real_width = info->requested_width + (info->expand ? extra_space : 0); - } - - /* iterate list for PACK_END cells */ - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (info->pack == GTK_PACK_START) - continue; - - if (!info->cell->visible) - continue; - - info->real_width = info->requested_width + (info->expand ? extra_space : 0); - } -} - -static gboolean -gtk_cell_view_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GList *i; - GtkCellView *cellview; - GdkRectangle area; - GtkCellRendererState state; - gboolean rtl = (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL); - - cellview = GTK_CELL_VIEW (widget); - - if (! GTK_WIDGET_DRAWABLE (widget)) - return FALSE; - - /* "blank" background */ - if (cellview->priv->background_set) - { - GdkGC *gc; - - gc = gdk_gc_new (GTK_WIDGET (cellview)->window); - gdk_gc_set_rgb_fg_color (gc, &cellview->priv->background); - - gdk_draw_rectangle (GTK_WIDGET (cellview)->window, - gc, - TRUE, - - /*0, 0,*/ - widget->allocation.x, - widget->allocation.y, - - widget->allocation.width, - widget->allocation.height); - - g_object_unref (G_OBJECT (gc)); - } - - /* set cell data (if available) */ - if (cellview->priv->displayed_row) - gtk_cell_view_set_cell_data (cellview); - else if (cellview->priv->model) - return FALSE; - - /* render cells */ - area = widget->allocation; - - /* we draw on our very own window, initialize x and y to zero */ - area.x = widget->allocation.x + (rtl ? widget->allocation.width : 0); - area.y = widget->allocation.y; - - if (GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT) - state = GTK_CELL_RENDERER_PRELIT; - else - state = 0; - - /* PACK_START */ - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (info->pack == GTK_PACK_END) - continue; - - if (!info->cell->visible) - continue; - - area.width = info->real_width; - if (rtl) - area.x -= area.width; - - gtk_cell_renderer_render (info->cell, - event->window, - widget, - /* FIXME! */ - &area, &area, &event->area, state); - - if (!rtl) - area.x += info->real_width; - } - - area.x = rtl ? widget->allocation.x : (widget->allocation.x + widget->allocation.width); - - /* PACK_END */ - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (info->pack == GTK_PACK_START) - continue; - - if (!info->cell->visible) - continue; - - area.width = info->real_width; - if (!rtl) - area.x -= area.width; - - gtk_cell_renderer_render (info->cell, - widget->window, - widget, - /* FIXME ! */ - &area, &area, &event->area, state); - if (rtl) - area.x += info->real_width; - } - - return FALSE; -} - -static GtkCellViewCellInfo * -gtk_cell_view_get_cell_info (GtkCellView *cellview, - GtkCellRenderer *renderer) -{ - GList *i; - - for (i = cellview->priv->cell_list; i; i = i->next) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data; - - if (info->cell == renderer) - return info; - } - - return NULL; -} - -static void -gtk_cell_view_set_cell_data (GtkCellView *cellview) -{ - GList *i; - GtkTreeIter iter; - GtkTreePath *path; - - g_return_if_fail (cellview->priv->displayed_row != NULL); - - path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row); - gtk_tree_model_get_iter (cellview->priv->model, &iter, path); - gtk_tree_path_free (path); - - for (i = cellview->priv->cell_list; i; i = i->next) - { - GSList *j; - GtkCellViewCellInfo *info = i->data; - - g_object_freeze_notify (G_OBJECT (info->cell)); - - for (j = info->attributes; j && j->next; j = j->next->next) - { - gchar *property = j->data; - gint column = GPOINTER_TO_INT (j->next->data); - GValue value = {0, }; - - gtk_tree_model_get_value (cellview->priv->model, &iter, - column, &value); - g_object_set_property (G_OBJECT (info->cell), - property, &value); - g_value_unset (&value); - } - - if (info->func) - (* info->func) (GTK_CELL_LAYOUT (cellview), - info->cell, - cellview->priv->model, - &iter, - info->func_data); - - g_object_thaw_notify (G_OBJECT (info->cell)); - } -} - -/* GtkCellLayout implementation */ -static void -gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout, - GtkCellRenderer *renderer, - gboolean expand) -{ - GtkCellViewCellInfo *info; - GtkCellView *cellview = GTK_CELL_VIEW (layout); - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); - g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer)); - - g_object_ref (G_OBJECT (renderer)); - gtk_object_sink (GTK_OBJECT (renderer)); - - info = g_new0 (GtkCellViewCellInfo, 1); - info->cell = renderer; - info->expand = expand ? TRUE : FALSE; - info->pack = GTK_PACK_START; - - cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info); -} - -static void -gtk_cell_view_cell_layout_pack_end (GtkCellLayout *layout, - GtkCellRenderer *renderer, - gboolean expand) -{ - GtkCellViewCellInfo *info; - GtkCellView *cellview = GTK_CELL_VIEW (layout); - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); - g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer)); - - g_object_ref (G_OBJECT (renderer)); - gtk_object_sink (GTK_OBJECT (renderer)); - - info = g_new0 (GtkCellViewCellInfo, 1); - info->cell = renderer; - info->expand = expand ? TRUE : FALSE; - info->pack = GTK_PACK_END; - - cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info); -} - -static void -gtk_cell_view_cell_layout_add_attribute (GtkCellLayout *layout, - GtkCellRenderer *renderer, - const gchar *attribute, - gint column) -{ - GtkCellViewCellInfo *info; - GtkCellView *cellview = GTK_CELL_VIEW (layout); - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - info = gtk_cell_view_get_cell_info (cellview, renderer); - g_return_if_fail (info != NULL); - - info->attributes = g_slist_prepend (info->attributes, - GINT_TO_POINTER (column)); - info->attributes = g_slist_prepend (info->attributes, - g_strdup (attribute)); -} - -static void -gtk_cell_view_cell_layout_clear (GtkCellLayout *layout) -{ - GtkCellView *cellview = GTK_CELL_VIEW (layout); - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - - while (cellview->priv->cell_list) - { - GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)cellview->priv->cell_list->data; - - gtk_cell_view_cell_layout_clear_attributes (layout, info->cell); - g_object_unref (G_OBJECT (info->cell)); - g_free (info); - cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list, - cellview->priv->cell_list); - } -} - -static void -gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout *layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy) -{ - GtkCellView *cellview = GTK_CELL_VIEW (layout); - GtkCellViewCellInfo *info; - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - - info = gtk_cell_view_get_cell_info (cellview, cell); - g_return_if_fail (info != NULL); - - if (info->destroy) - { - GDestroyNotify d = info->destroy; - - info->destroy = NULL; - d (info->func_data); - } - - info->func = func; - info->func_data = func_data; - info->destroy = destroy; -} - -static void -gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout, - GtkCellRenderer *renderer) -{ - GtkCellViewCellInfo *info; - GtkCellView *cellview = GTK_CELL_VIEW (layout); - GSList *list; - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); - - info = gtk_cell_view_get_cell_info (cellview, renderer); - if (info != NULL) - { - list = info->attributes; - while (list && list->next) - { - g_free (list->data); - list = list->next->next; - } - - g_slist_free (info->attributes); - info->attributes = NULL; - } -} - -static void -gtk_cell_view_cell_layout_reorder (GtkCellLayout *layout, - GtkCellRenderer *cell, - gint position) -{ - GList *link; - GtkCellViewCellInfo *info; - GtkCellView *cellview = GTK_CELL_VIEW (layout); - - g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - info = gtk_cell_view_get_cell_info (cellview, cell); - - g_return_if_fail (info != NULL); - g_return_if_fail (position >= 0); - - link = g_list_find (cellview->priv->cell_list, info); - - g_return_if_fail (link != NULL); - - cellview->priv->cell_list = g_list_remove_link (cellview->priv->cell_list, - link); - cellview->priv->cell_list = g_list_insert (cellview->priv->cell_list, - info, position); - - gtk_widget_queue_draw (GTK_WIDGET (cellview)); -} - -/* public API */ -GtkWidget * -gtk_cell_view_new (void) -{ - GtkCellView *cellview; - - cellview = GTK_CELL_VIEW (g_object_new (gtk_cell_view_get_type (), NULL)); - - return GTK_WIDGET (cellview); -} - -GtkWidget * -gtk_cell_view_new_with_text (const gchar *text) -{ - GtkCellView *cellview; - GtkCellRenderer *renderer; - GValue value = {0, }; - - cellview = GTK_CELL_VIEW (gtk_cell_view_new ()); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview), - renderer, TRUE); - - g_value_init (&value, G_TYPE_STRING); - g_value_set_string (&value, text); - gtk_cell_view_set_values (cellview, renderer, "text", &value, NULL); - g_value_unset (&value); - - return GTK_WIDGET (cellview); -} - -GtkWidget * -gtk_cell_view_new_with_markup (const gchar *markup) -{ - GtkCellView *cellview; - GtkCellRenderer *renderer; - GValue value = {0, }; - - cellview = GTK_CELL_VIEW (gtk_cell_view_new ()); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview), - renderer, TRUE); - - g_value_init (&value, G_TYPE_STRING); - g_value_set_string (&value, markup); - gtk_cell_view_set_values (cellview, renderer, "markup", &value, NULL); - g_value_unset (&value); - - return GTK_WIDGET (cellview); -} - -GtkWidget * -gtk_cell_view_new_with_pixbuf (GdkPixbuf *pixbuf) -{ - GtkCellView *cellview; - GtkCellRenderer *renderer; - GValue value = {0, }; - - cellview = GTK_CELL_VIEW (gtk_cell_view_new ()); - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview), - renderer, TRUE); - - g_value_init (&value, GDK_TYPE_PIXBUF); - g_value_set_object (&value, pixbuf); - gtk_cell_view_set_values (cellview, renderer, "pixbuf", &value, NULL); - g_value_unset (&value); - - return GTK_WIDGET (cellview); -} - -void -gtk_cell_view_set_value (GtkCellView *cell_view, - GtkCellRenderer *renderer, - gchar *property, - GValue *value) -{ - g_return_if_fail (GTK_IS_CELL_VIEW (cell_view)); - g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); - - g_object_set_property (G_OBJECT (renderer), property, value); - - /* force resize and redraw */ - gtk_widget_queue_resize (GTK_WIDGET (cell_view)); - gtk_widget_queue_draw (GTK_WIDGET (cell_view)); -} - -static void -gtk_cell_view_set_valuesv (GtkCellView *cell_view, - GtkCellRenderer *renderer, - va_list args) -{ - gchar *attribute; - GValue *value; - - attribute = va_arg (args, gchar *); - - while (attribute) - { - value = va_arg (args, GValue *); - gtk_cell_view_set_value (cell_view, renderer, attribute, value); - attribute = va_arg (args, gchar *); - } -} - -void -gtk_cell_view_set_values (GtkCellView *cell_view, - GtkCellRenderer *renderer, - ...) -{ - va_list args; - - g_return_if_fail (GTK_IS_CELL_VIEW (cell_view)); - g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); - g_return_if_fail (gtk_cell_view_get_cell_info (cell_view, renderer)); - - va_start (args, renderer); - gtk_cell_view_set_valuesv (cell_view, renderer, args); - va_end (args); -} - -void -gtk_cell_view_set_model (GtkCellView *cell_view, - GtkTreeModel *model) -{ - g_return_if_fail (GTK_IS_CELL_VIEW (cell_view)); - g_return_if_fail (GTK_IS_TREE_MODEL (model)); - - if (cell_view->priv->model) - { - if (cell_view->priv->displayed_row) - gtk_tree_row_reference_free (cell_view->priv->displayed_row); - cell_view->priv->displayed_row = NULL; - - g_object_unref (G_OBJECT (cell_view->priv->model)); - cell_view->priv->model = NULL; - } - - cell_view->priv->model = model; - - if (cell_view->priv->model) - g_object_ref (G_OBJECT (cell_view->priv->model)); -} - -/** - * gtk_cell_view_set_displayed_row: - * @cell_view: a #GtkCellView - * @path: a #GtkTreePath or %NULL to unset. - * - * Sets the row of the model that is currently displayed - * by the #GtkCellView. If the path is unset, then the - * contents of the cellview "stick" at their last value; - * this is not normally a desired result, but may be - * a needed intermediate state if say, the model for - * the #GtkCellView becomes temporarily empty. - **/ -void -gtk_cell_view_set_displayed_row (GtkCellView *cell_view, - GtkTreePath *path) -{ - g_return_if_fail (GTK_IS_CELL_VIEW (cell_view)); - g_return_if_fail (GTK_IS_TREE_MODEL (cell_view->priv->model)); - - if (cell_view->priv->displayed_row) - gtk_tree_row_reference_free (cell_view->priv->displayed_row); - - if (path) - { - cell_view->priv->displayed_row = - gtk_tree_row_reference_new (cell_view->priv->model, path); - } - else - cell_view->priv->displayed_row = NULL; - - /* force resize and redraw */ - gtk_widget_queue_resize (GTK_WIDGET (cell_view)); - gtk_widget_queue_draw (GTK_WIDGET (cell_view)); -} - -GtkTreePath * -gtk_cell_view_get_displayed_row (GtkCellView *cell_view) -{ - g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), NULL); - - if (!cell_view->priv->displayed_row) - return NULL; - - return gtk_tree_row_reference_get_path (cell_view->priv->displayed_row); -} - -gboolean -gtk_cell_view_get_size_of_row (GtkCellView *cell_view, - GtkTreePath *path, - GtkRequisition *requisition) -{ - GtkTreeRowReference *tmp; - GtkRequisition req; - - g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE); - g_return_val_if_fail (path != NULL, FALSE); - g_return_val_if_fail (requisition != NULL, FALSE); - - tmp = cell_view->priv->displayed_row; - cell_view->priv->displayed_row = - gtk_tree_row_reference_new (cell_view->priv->model, path); - - gtk_cell_view_size_request (GTK_WIDGET (cell_view), requisition); - - gtk_tree_row_reference_free (cell_view->priv->displayed_row); - cell_view->priv->displayed_row = tmp; - - /* restore actual size info */ - gtk_cell_view_size_request (GTK_WIDGET (cell_view), &req); - - return TRUE; -} - -void -gtk_cell_view_set_background_color (GtkCellView *view, - const GdkColor *color) -{ - g_return_if_fail (GTK_IS_CELL_VIEW (view)); - - if (color) - { - if (!view->priv->background_set) - { - view->priv->background_set = TRUE; - g_object_notify (G_OBJECT (view), "background_set"); - } - - view->priv->background = *color; - } - else - { - if (view->priv->background_set) - { - view->priv->background_set = FALSE; - g_object_notify (G_OBJECT (view), "background_set"); - } - } -} -#endif /* Gtk 2.6 */
--- a/pidgin/gtkcellview.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -/* gtkcellview.h - * Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -#ifndef __GTK_CELL_VIEW_H__ -#define __GTK_CELL_VIEW_H__ - -#include <gtk/gtkwidget.h> -#include <gtk/gtkcellrenderer.h> -#include <gtk/gtktreemodel.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_CELL_VIEW (gtk_cell_view_get_type ()) -#define GTK_CELL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW, GtkCellView)) -#define GTK_CELL_VIEW_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_CELL_VIEW, GtkCellViewClass)) -#define GTK_IS_CELL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW)) -#define GTK_IS_CELL_VIEW_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_CELL_VIEW)) -#define GTK_CELL_VIEW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_CELL_VIEW, GtkCellViewClass)) - -typedef struct _GtkCellView GtkCellView; -typedef struct _GtkCellViewClass GtkCellViewClass; -typedef struct _GtkCellViewPrivate GtkCellViewPrivate; - -struct _GtkCellView -{ - GtkWidget parent_instance; - - /*< private >*/ - GtkCellViewPrivate *priv; -}; - -struct _GtkCellViewClass -{ - GtkWidgetClass parent_class; -}; - -GType gtk_cell_view_get_type (void); -GtkWidget *gtk_cell_view_new (void); -GtkWidget *gtk_cell_view_new_with_text (const gchar *text); -GtkWidget *gtk_cell_view_new_with_markup (const gchar *markup); -GtkWidget *gtk_cell_view_new_with_pixbuf (GdkPixbuf *pixbuf); - - -void gtk_cell_view_set_value (GtkCellView *cell_view, - GtkCellRenderer *renderer, - gchar *property, - GValue *value); -void gtk_cell_view_set_values (GtkCellView *cell_view, - GtkCellRenderer *renderer, - ...); - -void gtk_cell_view_set_model (GtkCellView *cell_view, - GtkTreeModel *model); -void gtk_cell_view_set_displayed_row (GtkCellView *cell_view, - GtkTreePath *path); -GtkTreePath *gtk_cell_view_get_displayed_row (GtkCellView *cell_view); -gboolean gtk_cell_view_get_size_of_row (GtkCellView *cell_view, - GtkTreePath *path, - GtkRequisition *requisition); - -void gtk_cell_view_set_background_color (GtkCellView *cell_view, - const GdkColor *color); - -G_END_DECLS - -#endif /* __GTK_CELL_VIEW_H__ */
--- a/pidgin/gtkcellviewmenuitem.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ -/* gtkcellviewmenuitem.c - * Copyright (C) 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -/* -#include <config.h> -*/ -#include <gtk/gtkversion.h> -#if !GTK_CHECK_VERSION(2,6,0) -#include "gtkcellviewmenuitem.h" -#include "gtkcellview.h" - -struct _GtkCellViewMenuItemPrivate -{ - GtkWidget *cell_view; -}; - -static void gtk_cell_view_menu_item_init (GtkCellViewMenuItem *item); -static void gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass); -static void gtk_cell_view_menu_item_finalize (GObject *object); - - -GType -gtk_cell_view_menu_item_get_type (void) -{ - static GType cell_view_menu_item_type = 0; - - if (!cell_view_menu_item_type) - { - static const GTypeInfo cell_view_menu_item_info = - { - sizeof (GtkCellViewMenuItemClass), - NULL, - NULL, - (GClassInitFunc) gtk_cell_view_menu_item_class_init, - NULL, - NULL, - sizeof (GtkCellViewMenuItem), - 0, - (GInstanceInitFunc) gtk_cell_view_menu_item_init - }; - - cell_view_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, "PidginCellViewMenuItem", - &cell_view_menu_item_info, 0); - } - - return cell_view_menu_item_type; -} - -static void -gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass) -{ - GObjectClass *object_class; - - object_class = (GObjectClass *)klass; - object_class->finalize = gtk_cell_view_menu_item_finalize; -} - -static void -gtk_cell_view_menu_item_init (GtkCellViewMenuItem *item) -{ - item->priv = g_new0(GtkCellViewMenuItemPrivate,1); -} - -GtkWidget * -gtk_cell_view_menu_item_new (void) -{ - GtkCellViewMenuItem *item; - - item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL); - - item->priv->cell_view = gtk_cell_view_new (); - gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view); - gtk_widget_show (item->priv->cell_view); - - return GTK_WIDGET (item); -} - -GtkWidget * -gtk_cell_view_menu_item_new_with_pixbuf (GdkPixbuf *pixbuf) -{ - GtkCellViewMenuItem *item; - - item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL); - - item->priv->cell_view = gtk_cell_view_new_with_pixbuf (pixbuf); - gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view); - gtk_widget_show (item->priv->cell_view); - - return GTK_WIDGET (item); -} - -GtkWidget * -gtk_cell_view_menu_item_new_with_text (const gchar *text) -{ - GtkCellViewMenuItem *item; - - item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL); - - item->priv->cell_view = gtk_cell_view_new_with_text (text); - gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view); - gtk_widget_show (item->priv->cell_view); - - return GTK_WIDGET (item); -} - -GtkWidget * -gtk_cell_view_menu_item_new_with_markup (const gchar *markup) -{ - GtkCellViewMenuItem *item; - - item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL); - - item->priv->cell_view = gtk_cell_view_new_with_markup (markup); - gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view); - gtk_widget_show (item->priv->cell_view); - - return GTK_WIDGET (item); -} - -GtkWidget * -gtk_cell_view_menu_item_new_from_model (GtkTreeModel *model, - GtkTreePath *path) -{ - GtkCellViewMenuItem *item; - - item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL); - - item->priv->cell_view = gtk_cell_view_new (); - gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view); - - gtk_cell_view_set_model (GTK_CELL_VIEW (item->priv->cell_view), model); - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (item->priv->cell_view), path); - - gtk_widget_show (item->priv->cell_view); - - return GTK_WIDGET (item); -} - -static void -gtk_cell_view_menu_item_finalize (GObject *object) -{ - GtkCellViewMenuItem *item = GTK_CELL_VIEW_MENU_ITEM (object); - - g_free (item->priv); -} -#endif /* Gtk 2.6 */
--- a/pidgin/gtkcellviewmenuitem.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* gtkcellviewmenuitem.h - * Copyright (C) 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -#ifndef __GTK_CELL_VIEW_MENU_ITEM_H__ -#define __GTK_CELL_VIEW_MENU_ITEM_H__ - -#include <gtk/gtkmenuitem.h> -#include <gtk/gtktreemodel.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_CELL_VIEW_MENU_ITEM (gtk_cell_view_menu_item_get_type ()) -#define GTK_CELL_VIEW_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItem)) -#define GTK_CELL_VIEW_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItemClass)) -#define GTK_IS_CELL_VIEW_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM)) -#define GTK_IS_CELL_VIEW_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_VIEW_MENU_ITEM)) -#define GTK_CELL_VIEW_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItemClass)) - - -typedef struct _GtkCellViewMenuItem GtkCellViewMenuItem; -typedef struct _GtkCellViewMenuItemClass GtkCellViewMenuItemClass; -typedef struct _GtkCellViewMenuItemPrivate GtkCellViewMenuItemPrivate; - -struct _GtkCellViewMenuItem -{ - GtkMenuItem parent_instance; - - /*< private >*/ - GtkCellViewMenuItemPrivate *priv; -}; - -struct _GtkCellViewMenuItemClass -{ - GtkMenuItemClass parent_class; -}; - - -GType gtk_cell_view_menu_item_get_type (void); -GtkWidget *gtk_cell_view_menu_item_new (void); - -GtkWidget *gtk_cell_view_menu_item_new_with_pixbuf (GdkPixbuf *pixbuf); -GtkWidget *gtk_cell_view_menu_item_new_with_text (const gchar *text); -GtkWidget *gtk_cell_view_menu_item_new_with_markup (const gchar *markup); - -GtkWidget *gtk_cell_view_menu_item_new_from_model (GtkTreeModel *model, - GtkTreePath *path); - - -G_END_DECLS - -#endif /* __GTK_CELL_VIEW_MENU_ITEM_H__ */
--- a/pidgin/gtkconv.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkconv.c Sat Oct 03 21:31:14 2009 +0000 @@ -1077,11 +1077,7 @@ gdk_window_set_cursor(gtkblist->window->window, cursor); gdk_window_set_cursor(win->window->window, cursor); gdk_cursor_unref(cursor); -#if GTK_CHECK_VERSION(2,4,0) gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window))); -#else - gdk_flush(); -#endif name = purple_conversation_get_name(conv); account = purple_conversation_get_account(conv); @@ -2050,11 +2046,7 @@ case GDK_period: gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook), gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv), -#if GTK_CHECK_VERSION(2,2,0) (curconv + 1) % gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook))); -#else - (curconv + 1) % g_list_length(GTK_NOTEBOOK(win->notebook)->children)); -#endif return TRUE; break; case GDK_F6: @@ -3887,7 +3879,7 @@ gtk_size_group_add_widget(sg, image); /* Make our menu item */ - text = g_strdup_printf("%s (%s)", name, purple_account_get_username(account)); + text = g_strdup_printf("%s (%s)", name, purple_account_get_name_for_display(account)); menuitem = gtk_radio_menu_item_new_with_label(*group, text); g_free(text); *group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem)); @@ -4117,7 +4109,6 @@ color = (GdkColor*)get_nick_color(gtkconv, name); } -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values(ls, &iter, /* * The GTK docs are mute about the effects of the "row" value for performance. @@ -4135,18 +4126,6 @@ CHAT_USERS_COLOR_COLUMN, color, CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); -#else - gtk_list_store_append(ls, &iter); - gtk_list_store_set(ls, &iter, - CHAT_USERS_ICON_STOCK_COLUMN, stock, - CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, - CHAT_USERS_NAME_COLUMN, name, - CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, color, - CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, - -1); -#endif if (is_me && color) gdk_color_free(color); @@ -4790,9 +4769,7 @@ /* Setup the label telling how many people are in the room. */ gtkchat->count = gtk_label_new(_("0 people in room")); -#if GTK_CHECK_VERSION(2,6,0) gtk_label_set_ellipsize(GTK_LABEL(gtkchat->count), PANGO_ELLIPSIZE_END); -#endif gtk_box_pack_start(GTK_BOX(lbox), gtkchat->count, FALSE, FALSE, 0); gtk_widget_show(gtkchat->count); @@ -4859,10 +4836,8 @@ purple_signal_connect(blist_handle, "blist-node-aliased", gtkchat, PURPLE_CALLBACK(blist_node_aliased_cb), conv); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_column_set_expand(col, TRUE); g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); @@ -4918,9 +4893,7 @@ /* Setup the info pane */ event_box = gtk_event_box_new(); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), FALSE); -#endif gtk_widget_show(event_box); gtkconv->infopane_hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), event_box, FALSE, FALSE, 0); @@ -4990,9 +4963,7 @@ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "markup", CONV_TEXT_COLUMN, NULL); g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL); -#if GTK_CHECK_VERSION(2, 6, 0) g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif rend = gtk_cell_renderer_pixbuf_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE); @@ -6128,10 +6099,8 @@ ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list))); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls), GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID); -#endif l = cbuddies; while (l != NULL) { @@ -6233,12 +6202,7 @@ CHAT_USERS_NAME_COLUMN, &val, -1); if (!purple_utf8_strcasecmp((char *)l->data, val)) { -#if GTK_CHECK_VERSION(2,2,0) f = gtk_list_store_remove(GTK_LIST_STORE(model), &iter); -#else - gtk_list_store_remove(GTK_LIST_STORE(model), &iter); - f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter); -#endif } else f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter); @@ -6754,31 +6718,7 @@ ? gtk_entry_get_text(GTK_ENTRY(gtkconv->u.chat->topic_text)) : NULL; char *esc = NULL, *tmp; -#if GTK_CHECK_VERSION(2,6,0) esc = topic ? g_markup_escape_text(topic, -1) : NULL; -#else - /* GTK < 2.6 doesn't have auto ellipsization, so we do a crude - * trucation to prevent forcing the window to be as wide as the topic */ - int len = 0; - char *c; - - if (topic != NULL) { - tmp = g_strdup(topic); - c = tmp; - while(*c && len < 72) { - c = g_utf8_next_char(c); - len++; - } - if (len == 72) { - *c = '\0'; - c = g_strdup_printf("%s...", tmp); - g_free(tmp); - tmp = c; - } - esc = g_markup_escape_text(tmp, -1); - g_free(tmp); - } -#endif tmp = g_markup_escape_text(purple_conversation_get_title(conv), -1); markup = g_strdup_printf("%s%s<span color='%s' size='smaller'>%s</span>", tmp, esc && *esc ? "\n" : "", @@ -7129,9 +7069,7 @@ event = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE); -#endif gtk_widget_add_events(event, GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); g_signal_connect(G_OBJECT(event), "button-press-event", @@ -7204,12 +7142,7 @@ horiz = (gtk_notebook_get_tab_pos(notebook) == GTK_POS_TOP || gtk_notebook_get_tab_pos(notebook) == GTK_POS_BOTTOM); -#if GTK_CHECK_VERSION(2,2,0) count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); -#else - /* this is hacky, but it's only for Gtk 2.0.0... */ - count = g_list_length(GTK_NOTEBOOK(notebook)->children); -#endif for (i = 0; i < count; i++) { @@ -8174,9 +8107,7 @@ } gtk_rc_parse_string(str->str); g_string_free(str, TRUE); -#if GTK_CHECK_VERSION(2,4,0) gtk_rc_reset_styles(settings); -#endif } } @@ -8423,16 +8354,6 @@ return FALSE; } -#if !GTK_CHECK_VERSION(2,6,0) -/* Courtesy of Galeon! */ -static void -tab_close_button_state_changed_cb(GtkWidget *widget, GtkStateType prev_state) -{ - if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE) - gtk_widget_set_state(widget, GTK_STATE_NORMAL); -} -#endif - static void notebook_init_grab(PidginWindow *gtkwin, GtkWidget *widget) { @@ -9074,9 +8995,7 @@ entry = gtk_entry_new(); gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE); gtk_entry_set_width_chars(GTK_ENTRY(entry), 10); -#if GTK_CHECK_VERSION(2,4,0) gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5); -#endif gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), entry, TRUE, TRUE, 0); /* after the tab label */ @@ -9275,9 +9194,7 @@ GtkPositionType pos; GtkWidget *testidea; GtkWidget *menubar; -#if GTK_CHECK_VERSION(2,6,0) GdkModifierType state; -#endif win = g_malloc0(sizeof(PidginWindow)); @@ -9285,10 +9202,9 @@ /* Create the window. */ win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); -#if GTK_CHECK_VERSION(2,6,0) if (!gtk_get_current_event_state(&state)) gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); -#endif + /* Etan: I really think this entire function call should happen only * when we are on Windows but I was informed that back before we used * to save the window position we stored the window size, so I'm @@ -9477,9 +9393,7 @@ /* Close button. */ gtkconv->close = gtk_event_box_new(); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE); -#endif gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); close_image = gtk_label_new("×"); g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image); @@ -9492,16 +9406,6 @@ g_signal_connect(G_OBJECT(gtkconv->close), "button-press-event", G_CALLBACK(close_conv_cb), gtkconv); -#if !GTK_CHECK_VERSION(2,6,0) - /* - * I love Galeon. They have a fix for that stupid annoying visible - * border bug. I love you guys! -- ChipX86 - */ - /* This is fixed properly in some version of Gtk before 2.6.0 */ - g_signal_connect(G_OBJECT(gtkconv->close), "state_changed", - G_CALLBACK(tab_close_button_state_changed_cb), NULL); -#endif - /* Status icon. */ gtkconv->icon = gtk_image_new(); gtkconv->menu_icon = gtk_image_new(); @@ -9570,7 +9474,6 @@ else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8)) angle = 270; -#if GTK_CHECK_VERSION(2,6,0) if (!angle) { g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 4); @@ -9587,7 +9490,6 @@ } gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle); -#endif #if 0 gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5); @@ -9610,9 +9512,7 @@ } ebox = gtk_event_box_new(); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); -#endif gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby); if (gtkconv->tab_label->parent == NULL) {
--- a/pidgin/gtkdebug.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkdebug.c Sat Oct 03 21:31:14 2009 +0000 @@ -720,9 +720,7 @@ /* Setup our top button bar thingie. */ toolbar = gtk_toolbar_new(); gtk_toolbar_set_tooltips(GTK_TOOLBAR(toolbar), TRUE); -#if GTK_CHECK_VERSION(2,4,0) gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE); -#endif g_signal_connect(G_OBJECT(toolbar), "button-press-event", G_CALLBACK(toolbar_context), win); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
--- a/pidgin/gtkdialogs.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkdialogs.c Sat Oct 03 21:31:14 2009 +0000 @@ -47,6 +47,9 @@ static GList *dialogwindows = NULL; static GtkWidget *about = NULL; +static GtkWidget *buildinfo = NULL; +static GtkWidget *developer_info = NULL; +static GtkWidget *translator_info = NULL; struct _PidginGroupMergeObject { PurpleGroup* parent; @@ -351,6 +354,27 @@ } } +static void destroy_developer_info(void) +{ + if (developer_info != NULL) + gtk_widget_destroy(developer_info); + developer_info = NULL; +} + +static void destroy_translator_info(void) +{ + if (translator_info != NULL) + gtk_widget_destroy(translator_info); + translator_info = NULL; +} + +static void destroy_buildinfo(void) +{ + if (buildinfo != NULL) + gtk_widget_destroy(buildinfo); + buildinfo = NULL; +} + static void destroy_about(void) { if (about != NULL) @@ -420,7 +444,7 @@ tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME); about = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "about", TRUE); g_free(tmp); - gtk_window_set_default_size(GTK_WINDOW(about), 340, 450); + gtk_window_set_default_size(GTK_WINDOW(about), 450, 450); vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(about), FALSE, PIDGIN_HIG_BORDER); @@ -450,78 +474,99 @@ str = g_string_sized_new(4096); g_string_append_printf(str, - "<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR>(libpurple %s)<BR>%s<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION); + "<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER> (libpurple %s)" + "<BR>%s<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, + purple_core_get_version(), REVISION); + + g_string_append_printf(str, + _("%s is a messaging client based on libpurple which is capable of " + "connecting to multiple messaging services at once. %s is written " + "in C using GTK+. %s is released, and may be modified and " + "redistributed, under the terms of the GPL version 2 (or later). " + "A copy of the GPL is distributed with %s. %s is copyrighted by " + "its contributors, a list of whom is also distributed with %s. " + "There is no warranty for %s.<BR><BR>"), PIDGIN_NAME, PIDGIN_NAME, + PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME); g_string_append_printf(str, - _("%s is a graphical modular messaging client based on " - "libpurple which is capable of connecting to " - "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " - "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, " - "MySpaceIM, Gadu-Gadu, and QQ all at once. " - "It is written using GTK+.<BR><BR>" - "You may modify and redistribute the program under " - "the terms of the GPL (version 2 or later). A copy of the GPL is " - "contained in the 'COPYING' file distributed with %s. " - "%s is copyrighted by its contributors. See the 'COPYRIGHT' " - "file for the complete list of contributors. We provide no " - "warranty for this program.<BR><BR>"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME); + _("<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A " + "HREF=\"%s\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked " + "Questions</A><BR>\tIRC Channel: #pidgin on irc.freenode.net<BR>" + "\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"), PURPLE_WEBSITE, + "http://developer.pidgin.im/wiki/FAQ"); + + g_string_append_printf(str, + _("<font size=\"4\"><b>Help from other Pidgin users</b></font> is " + "available by e-mailing <a " + "href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>" + "This is a <b>public</b> mailing list! " + "(<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>" + "We can't help with third-party protocols or plugins!<br/>" + "This list's primary language is <b>English</b>. You are " + "welcome to post in another language, but the responses may " + "be less helpful.<br/><br/>")); - g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\"" - PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>"); - g_string_append_printf(str, _("<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"" - "http://developer.pidgin.im/wiki/FAQ\">" - "http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>")); - g_string_append_printf(str, - _("<font size=\"4\">Help from other Pidgin users:</font> " - "<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>" - "This is a <b>public</b> mailing list! " - "(<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>" - "We can't help with 3rd party protocols or plugins!<br/>" - "This list's primary language is <b>English</b>. You are " - "welcome to post in another language, but the responses may " - "be less helpful.<br/><br/>")); - g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC Channel:</FONT> " - "#pidgin on irc.freenode.net<BR><BR>")); - g_string_append_printf(str, _("<FONT SIZE=\"4\">XMPP MUC:</FONT> " - "devel@conference.pidgin.im<BR><BR>")); + + gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL); + g_string_free(str, TRUE); + + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + + /* Close Button */ + button = pidgin_dialog_add_button(GTK_DIALOG(about), GTK_STOCK_CLOSE, + G_CALLBACK(destroy_about), about); + + g_signal_connect(G_OBJECT(about), "destroy", + G_CALLBACK(destroy_about), G_OBJECT(about)); + + /* this makes the sizes not work? */ + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button); - /* Current Developers */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Current Developers")); - add_developers(str, developers); - g_string_append(str, "<BR/>"); + /* Let's give'em something to talk about -- woah woah woah */ + buddylist = pidgin_blist_get_default_gtk_blist(); + if (buddylist) + gtk_window_set_transient_for(GTK_WINDOW(about), + GTK_WINDOW(buddylist->window)); + + gtk_widget_show_all(about); + gtk_window_present(GTK_WINDOW(about)); +} - /* Crazy Patch Writers */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Crazy Patch Writers")); - add_developers(str, patch_writers); - g_string_append(str, "<BR/>"); - - /* Retired Developers */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Retired Developers")); - add_developers(str, retired_developers); - g_string_append(str, "<BR/>"); +void pidgin_dialogs_buildinfo() +{ + GtkWidget *vbox; + GtkWidget *frame; + GtkWidget *text; + GtkWidget *button; + GtkTextIter iter; + GString *str; + char *tmp; + PidginBuddyList *buddylist; - /* Retired Crazy Patch Writers */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Retired Crazy Patch Writers")); - add_developers(str, retired_patch_writers); - g_string_append(str, "<BR/>"); + if (about != NULL) { + gtk_window_present(GTK_WINDOW(about)); + return; + } + + tmp = g_strdup_printf(_("%s Build Information"), PIDGIN_NAME); + buildinfo = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "buildinfo", TRUE); + g_free(tmp); + gtk_window_set_default_size(GTK_WINDOW(buildinfo), 450, 450); - /* Current Translators */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Current Translators")); - add_translators(str, translators); - g_string_append(str, "<BR/>"); + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(buildinfo), FALSE, PIDGIN_HIG_BORDER); + + frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL); + gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); - /* Past Translators */ - g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", - _("Past Translators")); - add_translators(str, past_translators); - g_string_append(str, "<BR/>"); + str = g_string_sized_new(4096); - g_string_append_printf(str, "<FONT SIZE=\"4\">%s</FONT><br/>", _("Debugging Information")); + g_string_append_printf(str, + "<FONT SIZE=\"4\"><B>%s %s</B></FONT> (libpurple %s)<BR>%s<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION); + + g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s</B></FONT><br/>", _("Build Information")); /* The following primarly intented for user/developer interaction and thus ought not be translated */ @@ -699,11 +744,11 @@ gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); /* Close Button */ - button = pidgin_dialog_add_button(GTK_DIALOG(about), GTK_STOCK_CLOSE, - G_CALLBACK(destroy_about), about); + button = pidgin_dialog_add_button(GTK_DIALOG(buildinfo), GTK_STOCK_CLOSE, + G_CALLBACK(destroy_buildinfo), about); - g_signal_connect(G_OBJECT(about), "destroy", - G_CALLBACK(destroy_about), G_OBJECT(about)); + g_signal_connect(G_OBJECT(buildinfo), "destroy", + G_CALLBACK(destroy_buildinfo), G_OBJECT(buildinfo)); /* this makes the sizes not work? */ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); @@ -712,11 +757,159 @@ /* Let's give'em something to talk about -- woah woah woah */ buddylist = pidgin_blist_get_default_gtk_blist(); if (buddylist) - gtk_window_set_transient_for(GTK_WINDOW(about), + gtk_window_set_transient_for(GTK_WINDOW(buildinfo), GTK_WINDOW(buddylist->window)); - gtk_widget_show_all(about); - gtk_window_present(GTK_WINDOW(about)); + gtk_widget_show_all(buildinfo); + gtk_window_present(GTK_WINDOW(buildinfo)); +} + +void pidgin_dialogs_developers() +{ + GtkWidget *vbox; + GtkWidget *frame; + GtkWidget *text; + GtkWidget *button; + GtkTextIter iter; + GString *str; + char *tmp; + PidginBuddyList *buddylist; + + if (about != NULL) { + gtk_window_present(GTK_WINDOW(about)); + return; + } + + tmp = g_strdup_printf(_("%s Developer Information"), PIDGIN_NAME); + developer_info = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "developer_info", TRUE); + g_free(tmp); + gtk_window_set_default_size(GTK_WINDOW(developer_info), 450, 450); + + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(developer_info), FALSE, PIDGIN_HIG_BORDER); + + frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL); + gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + + str = g_string_sized_new(4096); + + /* Current Developers */ + g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>", + _("Current Developers")); + add_developers(str, developers); + g_string_append(str, "<BR/>"); + + /* Crazy Patch Writers */ + g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>", + _("Crazy Patch Writers")); + add_developers(str, patch_writers); + g_string_append(str, "<BR/>"); + + /* Retired Developers */ + g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>", + _("Retired Developers")); + add_developers(str, retired_developers); + g_string_append(str, "<BR/>"); + + /* Retired Crazy Patch Writers */ + g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>", + _("Retired Crazy Patch Writers")); + add_developers(str, retired_patch_writers); + g_string_append(str, "<BR/>"); + + gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL); + g_string_free(str, TRUE); + + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + + /* Close Button */ + button = pidgin_dialog_add_button(GTK_DIALOG(developer_info), GTK_STOCK_CLOSE, + G_CALLBACK(destroy_developer_info), about); + + g_signal_connect(G_OBJECT(developer_info), "destroy", + G_CALLBACK(destroy_developer_info), G_OBJECT(developer_info)); + + /* this makes the sizes not work? */ + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button); + + /* Let's give'em something to talk about -- woah woah woah */ + buddylist = pidgin_blist_get_default_gtk_blist(); + if (buddylist) + gtk_window_set_transient_for(GTK_WINDOW(developer_info), + GTK_WINDOW(buddylist->window)); + + gtk_widget_show_all(developer_info); + gtk_window_present(GTK_WINDOW(developer_info)); +} + +void pidgin_dialogs_translators() +{ + GtkWidget *vbox; + GtkWidget *frame; + GtkWidget *text; + GtkWidget *button; + GtkTextIter iter; + GString *str; + char *tmp; + PidginBuddyList *buddylist; + + if (about != NULL) { + gtk_window_present(GTK_WINDOW(about)); + return; + } + + tmp = g_strdup_printf(_("%s Translator Information"), PIDGIN_NAME); + translator_info = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "translator_info", TRUE); + g_free(tmp); + gtk_window_set_default_size(GTK_WINDOW(translator_info), 450, 450); + + vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(translator_info), FALSE, PIDGIN_HIG_BORDER); + + frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL); + gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + + str = g_string_sized_new(4096); + + /* Current Translators */ + g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", + _("Current Translators")); + add_translators(str, translators); + g_string_append(str, "<BR/>"); + + /* Past Translators */ + g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>", + _("Past Translators")); + add_translators(str, past_translators); + g_string_append(str, "<BR/>"); + + gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL); + g_string_free(str, TRUE); + + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + + /* Close Button */ + button = pidgin_dialog_add_button(GTK_DIALOG(translator_info), GTK_STOCK_CLOSE, + G_CALLBACK(destroy_translator_info), about); + + g_signal_connect(G_OBJECT(translator_info), "destroy", + G_CALLBACK(destroy_translator_info), G_OBJECT(translator_info)); + + /* this makes the sizes not work? */ + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button); + + /* Let's give'em something to talk about -- woah woah woah */ + buddylist = pidgin_blist_get_default_gtk_blist(); + if (buddylist) + gtk_window_set_transient_for(GTK_WINDOW(translator_info), + GTK_WINDOW(buddylist->window)); + + gtk_widget_show_all(translator_info); + gtk_window_present(GTK_WINDOW(translator_info)); } static void
--- a/pidgin/gtkdialogs.h Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkdialogs.h Sat Oct 03 21:31:14 2009 +0000 @@ -33,6 +33,9 @@ /* Functions in gtkdialogs.c (these should actually stay in this file) */ void pidgin_dialogs_destroy_all(void); void pidgin_dialogs_about(void); +void pidgin_dialogs_buildinfo(void); +void pidgin_dialogs_developers(void); +void pidgin_dialogs_translators(void); void pidgin_dialogs_im(void); void pidgin_dialogs_im_with_user(PurpleAccount *, const char *); void pidgin_dialogs_info(void);
--- a/pidgin/gtkdocklet-x11.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkdocklet-x11.c Sat Oct 03 21:31:14 2009 +0000 @@ -205,7 +205,6 @@ } } -#if GTK_CHECK_VERSION(2,2,0) static void docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data) @@ -230,7 +229,6 @@ *push_in = TRUE; } -#endif static void docklet_x11_destroy(void) @@ -344,11 +342,7 @@ docklet_x11_update_icon, docklet_x11_blank_icon, docklet_x11_set_tooltip, -#if GTK_CHECK_VERSION(2,2,0) docklet_x11_position_menu -#else - NULL -#endif }; void
--- a/pidgin/gtkexpander.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1659 +0,0 @@ -/* GTK - The GIMP Toolkit - * - * Copyright (C) 2003 Sun Microsystems, Inc. - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - * - * Authors: - * Mark McLoughlin <mark@skynet.ie> - */ - -/* -#include <config.h> -*/ - -#include <gtk/gtkversion.h> -#if !GTK_CHECK_VERSION(2,4,0) -#include "gtkexpander.h" - -#include <gtk/gtklabel.h> -#include <gtk/gtkcontainer.h> -#include <gtk/gtkmarshal.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkprivate.h> -#include <gdk/gdkkeysyms.h> - -#define P_(x) (x) - -#define DEFAULT_EXPANDER_SIZE 10 -#define DEFAULT_EXPANDER_SPACING 2 - -enum -{ - PROP_0, - PROP_EXPANDED, - PROP_LABEL, - PROP_USE_UNDERLINE, - PROP_USE_MARKUP, - PROP_SPACING, - PROP_LABEL_WIDGET -}; - -struct _GtkExpanderPrivate -{ - GtkWidget *label_widget; - GdkWindow *event_window; - gint spacing; - - GtkExpanderStyle expander_style; - guint animation_timeout; - - guint expanded : 1; - guint use_underline : 1; - guint use_markup : 1; - guint button_down : 1; - guint prelight : 1; -}; - -static void gtk_expander_class_init (GtkExpanderClass *klass); -static void gtk_expander_init (GtkExpander *expander); - -static void gtk_expander_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_expander_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void gtk_expander_finalize (GObject *object); - -static void gtk_expander_destroy (GtkObject *object); - -static void gtk_expander_realize (GtkWidget *widget); -static void gtk_expander_unrealize (GtkWidget *widget); -static void gtk_expander_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_expander_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gtk_expander_map (GtkWidget *widget); -static void gtk_expander_unmap (GtkWidget *widget); -static gboolean gtk_expander_expose (GtkWidget *widget, - GdkEventExpose *event); -static gboolean gtk_expander_button_press (GtkWidget *widget, - GdkEventButton *event); -static gboolean gtk_expander_button_release (GtkWidget *widget, - GdkEventButton *event); -static gboolean gtk_expander_enter_notify (GtkWidget *widget, - GdkEventCrossing *event); -static gboolean gtk_expander_leave_notify (GtkWidget *widget, - GdkEventCrossing *event); -static gboolean gtk_expander_focus (GtkWidget *widget, - GtkDirectionType direction); -static void gtk_expander_grab_notify (GtkWidget *widget, - gboolean was_grabbed); -static void gtk_expander_state_changed (GtkWidget *widget, - GtkStateType previous_state); - -static void gtk_expander_add (GtkContainer *container, - GtkWidget *widget); -static void gtk_expander_remove (GtkContainer *container, - GtkWidget *widget); -static void gtk_expander_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); - -static void gtk_expander_activate (GtkExpander *expander); - -static void get_expander_bounds (GtkExpander *expander, - GdkRectangle *rect); - -static GtkBinClass *parent_class = NULL; - -GType -gtk_expander_get_type (void) -{ - static GType expander_type = 0; - - if (!expander_type) - { - static const GTypeInfo expander_info = - { - sizeof (GtkExpanderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_expander_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkExpander), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_expander_init, - }; - - expander_type = g_type_register_static (GTK_TYPE_BIN, - "GtkExpander", - &expander_info, 0); - } - - return expander_type; -} - -static void -gtk_expander_class_init (GtkExpanderClass *klass) -{ - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class = (GObjectClass *) klass; - object_class = (GtkObjectClass *) klass; - widget_class = (GtkWidgetClass *) klass; - container_class = (GtkContainerClass *) klass; - - gobject_class->set_property = gtk_expander_set_property; - gobject_class->get_property = gtk_expander_get_property; - gobject_class->finalize = gtk_expander_finalize; - - object_class->destroy = gtk_expander_destroy; - - widget_class->realize = gtk_expander_realize; - widget_class->unrealize = gtk_expander_unrealize; - widget_class->size_request = gtk_expander_size_request; - widget_class->size_allocate = gtk_expander_size_allocate; - widget_class->map = gtk_expander_map; - widget_class->unmap = gtk_expander_unmap; - widget_class->expose_event = gtk_expander_expose; - widget_class->button_press_event = gtk_expander_button_press; - widget_class->button_release_event = gtk_expander_button_release; - widget_class->enter_notify_event = gtk_expander_enter_notify; - widget_class->leave_notify_event = gtk_expander_leave_notify; - widget_class->focus = gtk_expander_focus; - widget_class->grab_notify = gtk_expander_grab_notify; - widget_class->state_changed = gtk_expander_state_changed; - - container_class->add = gtk_expander_add; - container_class->remove = gtk_expander_remove; - container_class->forall = gtk_expander_forall; - - klass->activate = gtk_expander_activate; - - g_object_class_install_property (gobject_class, - PROP_EXPANDED, - g_param_spec_boolean ("expanded", - P_("Expanded"), - P_("Whether the expander has been opened to reveal the child widget"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_LABEL, - g_param_spec_string ("label", - P_("Label"), - P_("Text of the expander's label"), - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_USE_UNDERLINE, - g_param_spec_boolean ("use_underline", - P_("Use underline"), - P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_USE_MARKUP, - g_param_spec_boolean ("use_markup", - P_("Use markup"), - P_("The text of the label includes XML markup. See pango_parse_markup()"), - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_SPACING, - g_param_spec_int ("spacing", - P_("Spacing"), - P_("Space to put between the label and the child"), - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_LABEL_WIDGET, - g_param_spec_object ("label_widget", - P_("Label widget"), - P_("A widget to display in place of the usual expander label"), - GTK_TYPE_WIDGET, - G_PARAM_READWRITE)); - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("expander-size", - P_("Expander Size"), - P_("Size of the expander arrow"), - 0, - G_MAXINT, - DEFAULT_EXPANDER_SIZE, - G_PARAM_READABLE)); - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("expander-spacing", - P_("Indicator Spacing"), - P_("Spacing around expander arrow"), - 0, - G_MAXINT, - DEFAULT_EXPANDER_SPACING, - G_PARAM_READABLE)); - - widget_class->activate_signal = - g_signal_new ("activate", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkExpanderClass, activate), - NULL, NULL, - gtk_marshal_VOID__VOID, - G_TYPE_NONE, 0); -} - -static void -gtk_expander_finalize (GObject *obj) -{ - GtkExpander *self = (GtkExpander *)obj; - - g_free(self->priv); - - G_OBJECT_CLASS(parent_class)->finalize (obj); -} - -static void -gtk_expander_init (GtkExpander *expander) -{ - GtkExpanderPrivate *priv; - - expander->priv = priv = g_new0(GtkExpanderPrivate, 1); - - GTK_WIDGET_SET_FLAGS (expander, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (expander, GTK_NO_WINDOW); - - priv->label_widget = NULL; - priv->event_window = NULL; - priv->spacing = 0; - - priv->expander_style = GTK_EXPANDER_COLLAPSED; - priv->animation_timeout = 0; - - priv->expanded = FALSE; - priv->use_underline = FALSE; - priv->use_markup = FALSE; - priv->button_down = FALSE; - priv->prelight = FALSE; -} - -static void -gtk_expander_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkExpander *expander = GTK_EXPANDER (object); - - switch (prop_id) - { - case PROP_EXPANDED: - gtk_expander_set_expanded (expander, g_value_get_boolean (value)); - break; - case PROP_LABEL: - gtk_expander_set_label (expander, g_value_get_string (value)); - break; - case PROP_USE_UNDERLINE: - gtk_expander_set_use_underline (expander, g_value_get_boolean (value)); - break; - case PROP_USE_MARKUP: - gtk_expander_set_use_markup (expander, g_value_get_boolean (value)); - break; - case PROP_SPACING: - gtk_expander_set_spacing (expander, g_value_get_int (value)); - break; - case PROP_LABEL_WIDGET: - gtk_expander_set_label_widget (expander, g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_expander_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkExpander *expander = GTK_EXPANDER (object); - GtkExpanderPrivate *priv = expander->priv; - - switch (prop_id) - { - case PROP_EXPANDED: - g_value_set_boolean (value, priv->expanded); - break; - case PROP_LABEL: - g_value_set_string (value, gtk_expander_get_label (expander)); - break; - case PROP_USE_UNDERLINE: - g_value_set_boolean (value, priv->use_underline); - break; - case PROP_USE_MARKUP: - g_value_set_boolean (value, priv->use_markup); - break; - case PROP_SPACING: - g_value_set_int (value, priv->spacing); - break; - case PROP_LABEL_WIDGET: - g_value_set_object (value, - priv->label_widget ? - G_OBJECT (priv->label_widget) : NULL); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_expander_destroy (GtkObject *object) -{ - GtkExpanderPrivate *priv = GTK_EXPANDER (object)->priv; - - if (priv->animation_timeout) - { - g_source_remove (priv->animation_timeout); - priv->animation_timeout = 0; - } - - GTK_OBJECT_CLASS (parent_class)->destroy (object); -} - -static void -gtk_expander_realize (GtkWidget *widget) -{ - GtkExpanderPrivate *priv; - GdkWindowAttr attributes; - gint attributes_mask; - gint border_width; - GdkRectangle expander_rect; - - priv = GTK_EXPANDER (widget)->priv; - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - - border_width = GTK_CONTAINER (widget)->border_width; - - get_expander_bounds (GTK_EXPANDER (widget), &expander_rect); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x + border_width; - attributes.y = expander_rect.y; - attributes.width = MAX (widget->allocation.width - 2 * border_width, 1); - attributes.height = expander_rect.width; - attributes.wclass = GDK_INPUT_ONLY; - attributes.event_mask = gtk_widget_get_events (widget) | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK; - - attributes_mask = GDK_WA_X | GDK_WA_Y; - - widget->window = gtk_widget_get_parent_window (widget); - g_object_ref (widget->window); - - priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); - gdk_window_set_user_data (priv->event_window, widget); - - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); -} - -static void -gtk_expander_unrealize (GtkWidget *widget) -{ - GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv; - - if (priv->event_window) - { - gdk_window_set_user_data (priv->event_window, NULL); - gdk_window_destroy (priv->event_window); - priv->event_window = NULL; - } - - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); -} - -static void -gtk_expander_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkExpander *expander; - GtkBin *bin; - GtkExpanderPrivate *priv; - gint border_width; - gint expander_size; - gint expander_spacing; - gboolean interior_focus; - gint focus_width; - gint focus_pad; - - bin = GTK_BIN (widget); - expander = GTK_EXPANDER (widget); - priv = expander->priv; - - border_width = GTK_CONTAINER (widget)->border_width; - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - "expander-size", &expander_size, - "expander-spacing", &expander_spacing, - NULL); - - requisition->width = expander_size + 2 * expander_spacing + - 2 * focus_width + 2 * focus_pad; - requisition->height = interior_focus ? (2 * focus_width + 2 * focus_pad) : 0; - - if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget)) - { - GtkRequisition label_requisition; - - gtk_widget_size_request (priv->label_widget, &label_requisition); - - requisition->width += label_requisition.width; - requisition->height += label_requisition.height; - } - - requisition->height = MAX (expander_size + 2 * expander_spacing, requisition->height); - - if (!interior_focus) - requisition->height += 2 * focus_width + 2 * focus_pad; - - if (bin->child && GTK_WIDGET_CHILD_VISIBLE (bin->child)) - { - GtkRequisition child_requisition; - - gtk_widget_size_request (bin->child, &child_requisition); - - requisition->width = MAX (requisition->width, child_requisition.width); - requisition->height += child_requisition.height + priv->spacing; - } - - requisition->width += 2 * border_width; - requisition->height += 2 * border_width; -} - -static void -get_expander_bounds (GtkExpander *expander, - GdkRectangle *rect) -{ - GtkWidget *widget; - GtkBin *bin; - GtkExpanderPrivate *priv; - gint border_width; - gint expander_size; - gint expander_spacing; - gboolean interior_focus; - gint focus_width; - gint focus_pad; - gboolean ltr; - - widget = GTK_WIDGET (expander); - bin = GTK_BIN (expander); - priv = expander->priv; - - border_width = GTK_CONTAINER (expander)->border_width; - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - "expander-size", &expander_size, - "expander-spacing", &expander_spacing, - NULL); - - ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL; - - rect->x = widget->allocation.x + border_width; - rect->y = widget->allocation.y + border_width; - - if (ltr) - rect->x += expander_spacing; - else - rect->x += widget->allocation.width - 2 * border_width - - expander_spacing - expander_size; - - if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget)) - { - GtkAllocation label_allocation; - - label_allocation = priv->label_widget->allocation; - - if (expander_size < label_allocation.height) - rect->y += focus_width + focus_pad + (label_allocation.height - expander_size) / 2; - else - rect->y += expander_spacing; - } - else - { - rect->y += expander_spacing; - } - - if (!interior_focus) - { - if (ltr) - rect->x += focus_width + focus_pad; - else - rect->x -= focus_width + focus_pad; - rect->y += focus_width + focus_pad; - } - - rect->width = rect->height = expander_size; -} - -static void -gtk_expander_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkExpander *expander; - GtkBin *bin; - GtkExpanderPrivate *priv; - GtkRequisition child_requisition; - gboolean child_visible = FALSE; - gint border_width; - gint expander_size; - gint expander_spacing; - gboolean interior_focus; - gint focus_width; - gint focus_pad; - gint label_height; - - expander = GTK_EXPANDER (widget); - bin = GTK_BIN (widget); - priv = expander->priv; - - border_width = GTK_CONTAINER (widget)->border_width; - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - "expander-size", &expander_size, - "expander-spacing", &expander_spacing, - NULL); - - child_requisition.width = 0; - child_requisition.height = 0; - if (bin->child && GTK_WIDGET_CHILD_VISIBLE (bin->child)) - { - child_visible = TRUE; - gtk_widget_get_child_requisition (bin->child, &child_requisition); - } - - widget->allocation = *allocation; - - if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget)) - { - GtkAllocation label_allocation; - GtkRequisition label_requisition; - gboolean ltr; - - gtk_widget_get_child_requisition (priv->label_widget, &label_requisition); - - ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL; - - if (ltr) - label_allocation.x = (widget->allocation.x + - border_width + focus_width + focus_pad + - expander_size + 2 * expander_spacing); - else - label_allocation.x = (widget->allocation.x + widget->allocation.width - - (label_requisition.width + - border_width + focus_width + focus_pad + - expander_size + 2 * expander_spacing)); - - label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad; - - label_allocation.width = MIN (label_requisition.width, - allocation->width - 2 * border_width - - expander_size - 2 * expander_spacing - - 2 * focus_width - 2 * focus_pad); - label_allocation.width = MAX (label_allocation.width, 1); - - label_allocation.height = MIN (label_requisition.height, - allocation->height - 2 * border_width - - 2 * focus_width - 2 * focus_pad - - (child_visible ? priv->spacing : 0)); - label_allocation.height = MAX (label_allocation.height, 1); - - gtk_widget_size_allocate (priv->label_widget, &label_allocation); - - label_height = label_allocation.height; - } - else - { - label_height = 0; - } - - if (GTK_WIDGET_REALIZED (widget)) - { - GdkRectangle rect; - - get_expander_bounds (expander, &rect); - - gdk_window_move_resize (priv->event_window, - allocation->x + border_width, rect.y, - MAX (allocation->width - 2 * border_width, 1), rect.width); - } - - if (child_visible) - { - GtkAllocation child_allocation; - gint top_height; - - top_height = MAX (2 * expander_spacing + expander_size, - label_height + - (interior_focus ? 2 * focus_width + 2 * focus_pad : 0)); - - child_allocation.x = widget->allocation.x + border_width; - child_allocation.y = widget->allocation.y + border_width + top_height + priv->spacing; - - if (!interior_focus) - child_allocation.y += 2 * focus_width + 2 * focus_pad; - - child_allocation.width = MAX (allocation->width - 2 * border_width, 1); - - child_allocation.height = allocation->height - top_height - - 2 * border_width - priv->spacing - - (!interior_focus ? 2 * focus_width + 2 * focus_pad : 0); - child_allocation.height = MAX (child_allocation.height, 1); - - gtk_widget_size_allocate (bin->child, &child_allocation); - } -} - -static void -gtk_expander_map (GtkWidget *widget) -{ - GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv; - - if (priv->label_widget) - gtk_widget_map (priv->label_widget); - - GTK_WIDGET_CLASS (parent_class)->map (widget); - - if (priv->event_window) - gdk_window_show (priv->event_window); -} - -static void -gtk_expander_unmap (GtkWidget *widget) -{ - GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv; - - if (priv->event_window) - gdk_window_hide (priv->event_window); - - GTK_WIDGET_CLASS (parent_class)->unmap (widget); - - if (priv->label_widget) - gtk_widget_unmap (priv->label_widget); -} - -static void -gtk_expander_paint_prelight (GtkExpander *expander) -{ - GtkWidget *widget; - GtkContainer *container; - GtkExpanderPrivate *priv; - GdkRectangle area; - gboolean interior_focus; - int focus_width; - int focus_pad; - int expander_size; - int expander_spacing; - - priv = expander->priv; - widget = GTK_WIDGET (expander); - container = GTK_CONTAINER (expander); - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - "expander-size", &expander_size, - "expander-spacing", &expander_spacing, - NULL); - - area.x = widget->allocation.x + container->border_width; - area.y = widget->allocation.y + container->border_width; - area.width = widget->allocation.width - (2 * container->border_width); - - if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget)) - area.height = priv->label_widget->allocation.height; - else - area.height = 0; - - area.height += interior_focus ? (focus_width + focus_pad) * 2 : 0; - area.height = MAX (area.height, expander_size + 2 * expander_spacing); - area.height += !interior_focus ? (focus_width + focus_pad) * 2 : 0; - - gtk_paint_flat_box (widget->style, widget->window, - GTK_STATE_PRELIGHT, - GTK_SHADOW_ETCHED_OUT, - &area, widget, "expander", - area.x, area.y, - area.width, area.height); -} - -static void -gtk_expander_paint (GtkExpander *expander) -{ - GtkWidget *widget; - GdkRectangle clip; - GtkStateType state; - - widget = GTK_WIDGET (expander); - - get_expander_bounds (expander, &clip); - - state = widget->state; - if (expander->priv->prelight) - { - state = GTK_STATE_PRELIGHT; - - gtk_expander_paint_prelight (expander); - } - - gtk_paint_expander (widget->style, - widget->window, - state, - &clip, - widget, - "expander", - clip.x + clip.width / 2, - clip.y + clip.height / 2, - expander->priv->expander_style); -} - -static void -gtk_expander_paint_focus (GtkExpander *expander, - GdkRectangle *area) -{ - GtkWidget *widget; - GtkExpanderPrivate *priv; - gint x, y, width, height; - gboolean interior_focus; - gint border_width; - gint focus_width; - gint focus_pad; - gint expander_size; - gint expander_spacing; - gboolean ltr; - - widget = GTK_WIDGET (expander); - priv = expander->priv; - - border_width = GTK_CONTAINER (widget)->border_width; - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - "expander-size", &expander_size, - "expander-spacing", &expander_spacing, - NULL); - - ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL; - - x = widget->allocation.x + border_width; - y = widget->allocation.y + border_width; - - if (ltr && interior_focus) - x += expander_spacing * 2 + expander_size; - - width = height = 0; - - if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget)) - { - GtkAllocation label_allocation = priv->label_widget->allocation; - - width = label_allocation.width; - height = label_allocation.height; - } - - if (!interior_focus) - { - width += expander_size + 2 * expander_spacing; - height = MAX (height, expander_size + 2 * expander_spacing); - } - - width += 2 * focus_pad + 2 * focus_width; - height += 2 * focus_pad + 2 * focus_width; - - gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), - area, widget, "expander", - x, y, width, height); -} - -static gboolean -gtk_expander_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - if (GTK_WIDGET_DRAWABLE (widget)) - { - GtkExpander *expander = GTK_EXPANDER (widget); - - gtk_expander_paint (expander); - - if (GTK_WIDGET_HAS_FOCUS (expander)) - gtk_expander_paint_focus (expander, &event->area); - - GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); - } - - return FALSE; -} - -static gboolean -gtk_expander_button_press (GtkWidget *widget, - GdkEventButton *event) -{ - GtkExpander *expander = GTK_EXPANDER (widget); - - if (event->button == 1 && event->window == expander->priv->event_window) - { - expander->priv->button_down = TRUE; - return TRUE; - } - - return FALSE; -} - -static gboolean -gtk_expander_button_release (GtkWidget *widget, - GdkEventButton *event) -{ - GtkExpander *expander = GTK_EXPANDER (widget); - - if (event->button == 1 && expander->priv->button_down) - { - gtk_widget_activate (widget); - expander->priv->button_down = FALSE; - return TRUE; - } - - return FALSE; -} - -static void -gtk_expander_grab_notify (GtkWidget *widget, - gboolean was_grabbed) -{ - if (!was_grabbed) - GTK_EXPANDER (widget)->priv->button_down = FALSE; -} - -static void -gtk_expander_state_changed (GtkWidget *widget, - GtkStateType previous_state) -{ - if (!GTK_WIDGET_IS_SENSITIVE (widget)) - GTK_EXPANDER (widget)->priv->button_down = FALSE; -} - -static void -gtk_expander_redraw_expander (GtkExpander *expander) -{ - GtkWidget *widget; - - widget = GTK_WIDGET (expander); - - if (GTK_WIDGET_REALIZED (widget)) - gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE); -} - -static gboolean -gtk_expander_enter_notify (GtkWidget *widget, - GdkEventCrossing *event) -{ - GtkExpander *expander = GTK_EXPANDER (widget); - GtkWidget *event_widget; - - event_widget = gtk_get_event_widget ((GdkEvent *) event); - - if (event_widget == widget && - event->detail != GDK_NOTIFY_INFERIOR) - { - expander->priv->prelight = TRUE; - - if (expander->priv->label_widget) - gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_PRELIGHT); - - gtk_expander_redraw_expander (expander); - } - - return FALSE; -} - -static gboolean -gtk_expander_leave_notify (GtkWidget *widget, - GdkEventCrossing *event) -{ - GtkExpander *expander = GTK_EXPANDER (widget); - GtkWidget *event_widget; - - event_widget = gtk_get_event_widget ((GdkEvent *) event); - - if (event_widget == widget && - event->detail != GDK_NOTIFY_INFERIOR) - { - expander->priv->prelight = FALSE; - - if (expander->priv->label_widget) - gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_NORMAL); - - gtk_expander_redraw_expander (expander); - } - - return FALSE; -} - -typedef enum -{ - FOCUS_NONE, - FOCUS_WIDGET, - FOCUS_LABEL, - FOCUS_CHILD -} FocusSite; - -static gboolean -focus_current_site (GtkExpander *expander, - GtkDirectionType direction) -{ - GtkWidget *current_focus; - - current_focus = GTK_CONTAINER (expander)->focus_child; - - if (!current_focus) - return FALSE; - - return gtk_widget_child_focus (current_focus, direction); -} - -static gboolean -focus_in_site (GtkExpander *expander, - FocusSite site, - GtkDirectionType direction) -{ - switch (site) - { - case FOCUS_WIDGET: - gtk_widget_grab_focus (GTK_WIDGET (expander)); - return TRUE; - case FOCUS_LABEL: - if (expander->priv->label_widget) - return gtk_widget_child_focus (expander->priv->label_widget, direction); - else - return FALSE; - case FOCUS_CHILD: - { - GtkWidget *child = gtk_bin_get_child (GTK_BIN (expander)); - - if (child && GTK_WIDGET_CHILD_VISIBLE (child)) - return gtk_widget_child_focus (child, direction); - else - return FALSE; - } - case FOCUS_NONE: - break; - } - - g_assert_not_reached (); - return FALSE; -} - -static FocusSite -get_next_site (GtkExpander *expander, - FocusSite site, - GtkDirectionType direction) -{ - gboolean ltr; - - ltr = gtk_widget_get_direction (GTK_WIDGET (expander)) != GTK_TEXT_DIR_RTL; - - switch (site) - { - case FOCUS_NONE: - switch (direction) - { - case GTK_DIR_TAB_BACKWARD: - case GTK_DIR_LEFT: - case GTK_DIR_UP: - return FOCUS_CHILD; - case GTK_DIR_TAB_FORWARD: - case GTK_DIR_DOWN: - case GTK_DIR_RIGHT: - return FOCUS_WIDGET; - } - case FOCUS_WIDGET: - switch (direction) - { - case GTK_DIR_TAB_BACKWARD: - case GTK_DIR_UP: - return FOCUS_NONE; - case GTK_DIR_LEFT: - return ltr ? FOCUS_NONE : FOCUS_LABEL; - case GTK_DIR_TAB_FORWARD: - case GTK_DIR_DOWN: - return FOCUS_LABEL; - case GTK_DIR_RIGHT: - return ltr ? FOCUS_LABEL : FOCUS_NONE; - break; - } - case FOCUS_LABEL: - switch (direction) - { - case GTK_DIR_TAB_BACKWARD: - case GTK_DIR_UP: - return FOCUS_WIDGET; - case GTK_DIR_LEFT: - return ltr ? FOCUS_WIDGET : FOCUS_CHILD; - case GTK_DIR_TAB_FORWARD: - case GTK_DIR_DOWN: - return FOCUS_CHILD; - case GTK_DIR_RIGHT: - return ltr ? FOCUS_CHILD : FOCUS_WIDGET; - break; - } - case FOCUS_CHILD: - switch (direction) - { - case GTK_DIR_TAB_BACKWARD: - case GTK_DIR_LEFT: - case GTK_DIR_UP: - return FOCUS_LABEL; - case GTK_DIR_TAB_FORWARD: - case GTK_DIR_DOWN: - case GTK_DIR_RIGHT: - return FOCUS_NONE; - } - } - - g_assert_not_reached (); - return FOCUS_NONE; -} - -static gboolean -gtk_expander_focus (GtkWidget *widget, - GtkDirectionType direction) -{ - GtkExpander *expander = GTK_EXPANDER (widget); - - if (!focus_current_site (expander, direction)) - { - GtkWidget *old_focus_child; - gboolean widget_is_focus; - FocusSite site = FOCUS_NONE; - - widget_is_focus = gtk_widget_is_focus (widget); - old_focus_child = GTK_CONTAINER (widget)->focus_child; - - if (old_focus_child && old_focus_child == expander->priv->label_widget) - site = FOCUS_LABEL; - else if (old_focus_child) - site = FOCUS_CHILD; - else if (widget_is_focus) - site = FOCUS_WIDGET; - - while ((site = get_next_site (expander, site, direction)) != FOCUS_NONE) - { - if (focus_in_site (expander, site, direction)) - return TRUE; - } - - return FALSE; - } - - return TRUE; -} - -static void -gtk_expander_add (GtkContainer *container, - GtkWidget *widget) -{ - GTK_CONTAINER_CLASS (parent_class)->add (container, widget); - - gtk_widget_set_child_visible (widget, GTK_EXPANDER (container)->priv->expanded); - gtk_widget_queue_resize (GTK_WIDGET (container)); -} - -static void -gtk_expander_remove (GtkContainer *container, - GtkWidget *widget) -{ - GtkExpander *expander = GTK_EXPANDER (container); - - if (GTK_EXPANDER (expander)->priv->label_widget == widget) - gtk_expander_set_label_widget (expander, NULL); - else - GTK_CONTAINER_CLASS (parent_class)->remove (container, widget); -} - -static void -gtk_expander_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GtkBin *bin = GTK_BIN (container); - GtkExpanderPrivate *priv = GTK_EXPANDER (container)->priv; - - if (bin->child) - (* callback) (bin->child, callback_data); - - if (priv->label_widget) - (* callback) (priv->label_widget, callback_data); -} - -static void -gtk_expander_activate (GtkExpander *expander) -{ - gtk_expander_set_expanded (expander, !expander->priv->expanded); -} - - -/** - * gtk_expander_new: - * @label: the text of the label - * - * Creates a new expander using @label as the text of the label. - * - * Return value: a new #GtkExpander widget. - * - * Since: 2.4 - **/ -GtkWidget * -gtk_expander_new (const gchar *label) -{ - return g_object_new (GTK_TYPE_EXPANDER, "label", label, NULL); -} - -/** - * gtk_expander_new_with_mnemonic: - * @label: the text of the label with an underscore in front of the - * mnemonic character - * - * Creates a new expander using @label as the text of the label. - * If characters in @label are preceded by an underscore, they are underlined. - * If you need a literal underscore character in a label, use '__' (two - * underscores). The first underlined character represents a keyboard - * accelerator called a mnemonic. - * Pressing Alt and that key activates the button. - * - * Return value: a new #GtkExpander widget. - * - * Since: 2.4 - **/ -GtkWidget * -gtk_expander_new_with_mnemonic (const gchar *label) -{ - return g_object_new (GTK_TYPE_EXPANDER, - "label", label, - "use_underline", TRUE, - NULL); -} - -static gboolean -gtk_expander_animation_timeout (GtkExpander *expander) -{ - GtkExpanderPrivate *priv = expander->priv; - GdkRectangle area; - gboolean finish = FALSE; - - GDK_THREADS_ENTER(); - - if (GTK_WIDGET_REALIZED (expander)) - { - get_expander_bounds (expander, &area); - gdk_window_invalidate_rect (GTK_WIDGET (expander)->window, &area, TRUE); - } - - if (priv->expanded) - { - if (priv->expander_style == GTK_EXPANDER_COLLAPSED) - { - priv->expander_style = GTK_EXPANDER_SEMI_EXPANDED; - } - else - { - priv->expander_style = GTK_EXPANDER_EXPANDED; - finish = TRUE; - } - } - else - { - if (priv->expander_style == GTK_EXPANDER_EXPANDED) - { - priv->expander_style = GTK_EXPANDER_SEMI_COLLAPSED; - } - else - { - priv->expander_style = GTK_EXPANDER_COLLAPSED; - finish = TRUE; - } - } - - if (finish) - { - priv->animation_timeout = 0; - if (GTK_BIN (expander)->child) - gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded); - gtk_widget_queue_resize (GTK_WIDGET (expander)); - } - - GDK_THREADS_LEAVE(); - - return !finish; -} - -static void -gtk_expander_start_animation (GtkExpander *expander) -{ - GtkExpanderPrivate *priv = expander->priv; - - if (priv->animation_timeout) - g_source_remove (priv->animation_timeout); - - priv->animation_timeout = - g_timeout_add (50, - (GSourceFunc) gtk_expander_animation_timeout, - expander); -} - -/** - * gtk_expander_set_expanded: - * @expander: a #GtkExpander - * @expanded: whether the child widget is revealed - * - * Sets the state of the expander. Set to %TRUE, if you want - * the child widget to be revealed, and %FALSE if you want the - * child widget to be hidden. - * - * Since: 2.4 - **/ -void -gtk_expander_set_expanded (GtkExpander *expander, - gboolean expanded) -{ - GtkExpanderPrivate *priv; - - g_return_if_fail (GTK_IS_EXPANDER (expander)); - - priv = expander->priv; - - expanded = expanded != FALSE; - - if (priv->expanded != expanded) - { - priv->expanded = expanded; - - if (GTK_WIDGET_REALIZED (expander)) - { - gtk_expander_start_animation (expander); - } - else - { - priv->expander_style = expanded ? GTK_EXPANDER_EXPANDED : - GTK_EXPANDER_COLLAPSED; - - if (GTK_BIN (expander)->child) - { - gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded); - gtk_widget_queue_resize (GTK_WIDGET (expander)); - } - } - - g_object_notify (G_OBJECT (expander), "expanded"); - } -} - -/** - * gtk_expander_get_expanded: - * @expander:a #GtkExpander - * - * Queries a #GtkExpander and returns its current state. Returns %TRUE - * if the child widget is revealed. - * - * See gtk_expander_set_expanded(). - * - * Return value: the current state of the expander. - * - * Since: 2.4 - **/ -gboolean -gtk_expander_get_expanded (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE); - - return expander->priv->expanded; -} - -/** - * gtk_expander_set_spacing: - * @expander: a #GtkExpander - * @spacing: distance between the expander and child in pixels. - * - * Sets the spacing field of @expander, which is the number of pixels to - * place between expander and the child. - * - * Since: 2.4 - **/ -void -gtk_expander_set_spacing (GtkExpander *expander, - gint spacing) -{ - g_return_if_fail (GTK_IS_EXPANDER (expander)); - g_return_if_fail (spacing >= 0); - - if (expander->priv->spacing != spacing) - { - expander->priv->spacing = spacing; - - gtk_widget_queue_resize (GTK_WIDGET (expander)); - - g_object_notify (G_OBJECT (expander), "spacing"); - } -} - -/** - * gtk_expander_get_spacing: - * @expander: a #GtkExpander - * - * Gets the value set by gtk_expander_set_spacing(). - * - * Return value: spacing between the expander and child. - * - * Since: 2.4 - **/ -gint -gtk_expander_get_spacing (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), 0); - - return expander->priv->spacing; -} - -/** - * gtk_expander_set_label: - * @expander: a #GtkExpander - * @label: a string - * - * Sets the text of the label of the expander to @label. - * - * This will also clear any previously set labels. - * - * Since: 2.4 - **/ -void -gtk_expander_set_label (GtkExpander *expander, - const gchar *label) -{ - g_return_if_fail (GTK_IS_EXPANDER (expander)); - - if (!label) - { - gtk_expander_set_label_widget (expander, NULL); - } - else - { - GtkWidget *child; - - child = gtk_label_new (label); - gtk_label_set_use_underline (GTK_LABEL (child), expander->priv->use_underline); - gtk_label_set_use_markup (GTK_LABEL (child), expander->priv->use_markup); - gtk_widget_show (child); - - gtk_expander_set_label_widget (expander, child); - } - - g_object_notify (G_OBJECT (expander), "label"); -} - -/** - * gtk_expander_get_label: - * @expander: a #GtkExpander - * - * Fetches the text from the label of the expander, as set by - * gtk_expander_set_label(). If the label text has not - * been set the return value will be %NULL. This will be the - * case if you create an empty button with gtk_button_new() to - * use as a container. - * - * Return value: The text of the label widget. This string is owned - * by the widget and must not be modified or freed. - * - * Since: 2.4 - **/ -G_CONST_RETURN char * -gtk_expander_get_label (GtkExpander *expander) -{ - GtkExpanderPrivate *priv; - - g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL); - - priv = expander->priv; - - if (priv->label_widget && GTK_IS_LABEL (priv->label_widget)) - return gtk_label_get_text (GTK_LABEL (priv->label_widget)); - else - return NULL; -} - -/** - * gtk_expander_set_use_underline: - * @expander: a #GtkExpander - * @use_underline: %TRUE if underlines in the text indicate mnemonics - * - * If true, an underline in the text of the expander label indicates - * the next character should be used for the mnemonic accelerator key. - * - * Since: 2.4 - **/ -void -gtk_expander_set_use_underline (GtkExpander *expander, - gboolean use_underline) -{ - GtkExpanderPrivate *priv; - - g_return_if_fail (GTK_IS_EXPANDER (expander)); - - priv = expander->priv; - - use_underline = use_underline != FALSE; - - if (priv->use_underline != use_underline) - { - priv->use_underline = use_underline; - - if (priv->label_widget && GTK_IS_LABEL (priv->label_widget)) - gtk_label_set_use_underline (GTK_LABEL (priv->label_widget), use_underline); - - g_object_notify (G_OBJECT (expander), "use-underline"); - } -} - -/** - * gtk_expander_get_use_underline: - * @expander: a #GtkExpander - * - * Returns whether an embedded underline in the expander label indicates a - * mnemonic. See gtk_expander_set_use_underline(). - * - * Return value: %TRUE if an embedded underline in the expander label - * indicates the mnemonic accelerator keys. - * - * Since: 2.4 - **/ -gboolean -gtk_expander_get_use_underline (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE); - - return expander->priv->use_underline; -} - -/** - * gtk_expander_set_use_markup: - * @expander: a #GtkExpander - * @use_markup: %TRUE if the label's text should be parsed for markup - * - * Sets whether the text of the label contains markup in <link - * linkend="PangoMarkupFormat">Pango's text markup - * language</link>. See gtk_label_set_markup(). - * - * Since: 2.4 - **/ -void -gtk_expander_set_use_markup (GtkExpander *expander, - gboolean use_markup) -{ - GtkExpanderPrivate *priv; - - g_return_if_fail (GTK_IS_EXPANDER (expander)); - - priv = expander->priv; - - use_markup = use_markup != FALSE; - - if (priv->use_markup != use_markup) - { - priv->use_markup = use_markup; - - if (priv->label_widget && GTK_IS_LABEL (priv->label_widget)) - gtk_label_set_use_markup (GTK_LABEL (priv->label_widget), use_markup); - - g_object_notify (G_OBJECT (expander), "use-markup"); - } -} - -/** - * gtk_expander_get_use_markup: - * @expander: a #GtkExpander - * - * Returns whether the label's text is interpreted as marked up with - * the <link linkend="PangoMarkupFormat">Pango text markup - * language</link>. See gtk_expander_set_use_markup (). - * - * Return value: %TRUE if the label's text will be parsed for markup - * - * Since: 2.4 - **/ -gboolean -gtk_expander_get_use_markup (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE); - - return expander->priv->use_markup; -} - -/** - * gtk_expander_set_label_widget: - * @expander: a #GtkExpander - * @label_widget: the new label widget - * - * Set the label widget for the expander. This is the widget - * that will appear embedded alongside the expander arrow. - * - * Since: 2.4 - **/ -void -gtk_expander_set_label_widget (GtkExpander *expander, - GtkWidget *label_widget) -{ - GtkExpanderPrivate *priv; - - g_return_if_fail (GTK_IS_EXPANDER (expander)); - g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget)); - g_return_if_fail (label_widget == NULL || label_widget->parent == NULL); - - priv = expander->priv; - - if (priv->label_widget == label_widget) - return; - - if (priv->label_widget) - { - gtk_widget_set_state (priv->label_widget, GTK_STATE_NORMAL); - gtk_widget_unparent (priv->label_widget); - } - - priv->label_widget = label_widget; - - if (label_widget) - { - priv->label_widget = label_widget; - - gtk_widget_set_parent (label_widget, GTK_WIDGET (expander)); - - if (priv->prelight) - gtk_widget_set_state (label_widget, GTK_STATE_PRELIGHT); - } - - if (GTK_WIDGET_VISIBLE (expander)) - gtk_widget_queue_resize (GTK_WIDGET (expander)); - - g_object_freeze_notify (G_OBJECT (expander)); - g_object_notify (G_OBJECT (expander), "label-widget"); - g_object_notify (G_OBJECT (expander), "label"); - g_object_thaw_notify (G_OBJECT (expander)); -} - -/** - * gtk_expander_get_label_widget: - * @expander: a #GtkExpander - * - * Retrieves the label widget for the frame. See - * gtk_expander_set_label_widget(). - * - * Return value: the label widget, or %NULL if there is none. - * - * Since: 2.4 - **/ -GtkWidget * -gtk_expander_get_label_widget (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL); - - return expander->priv->label_widget; -} - -#define __GTK_EXPANDER_C__ - -#endif /* Gtk 2.4 */
--- a/pidgin/gtkexpander.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -/* GTK - The GIMP Toolkit - * - * Copyright (C) 2003 Sun Microsystems, Inc. - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - * - * Authors: - * Mark McLoughlin <mark@skynet.ie> - */ - -#ifndef __GTK_EXPANDER_H__ -#define __GTK_EXPANDER_H__ - -#include <gtk/gtkbin.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_EXPANDER (gtk_expander_get_type ()) -#define GTK_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER, GtkExpander)) -#define GTK_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER, GtkExpanderClass)) -#define GTK_IS_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER)) -#define GTK_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EXPANDER)) -#define GTK_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EXPANDER, GtkExpanderClass)) - -typedef struct _GtkExpander GtkExpander; -typedef struct _GtkExpanderClass GtkExpanderClass; -typedef struct _GtkExpanderPrivate GtkExpanderPrivate; - -struct _GtkExpander -{ - GtkBin bin; - - GtkExpanderPrivate *priv; -}; - -struct _GtkExpanderClass -{ - GtkBinClass parent_class; - - /* Key binding signal; to get notification on the expansion - * state connect to notify:expanded. - */ - void (* activate) (GtkExpander *expander); -}; - -GType gtk_expander_get_type (void) G_GNUC_CONST; - -GtkWidget *gtk_expander_new (const gchar *label); -GtkWidget *gtk_expander_new_with_mnemonic (const gchar *label); - -void gtk_expander_set_expanded (GtkExpander *expander, - gboolean expanded); -gboolean gtk_expander_get_expanded (GtkExpander *expander); - -/* Spacing between the expander/label and the child */ -void gtk_expander_set_spacing (GtkExpander *expander, - gint spacing); -gint gtk_expander_get_spacing (GtkExpander *expander); - -void gtk_expander_set_label (GtkExpander *expander, - const gchar *label); -G_CONST_RETURN gchar *gtk_expander_get_label (GtkExpander *expander); - -void gtk_expander_set_use_underline (GtkExpander *expander, - gboolean use_underline); -gboolean gtk_expander_get_use_underline (GtkExpander *expander); - -void gtk_expander_set_use_markup (GtkExpander *expander, - gboolean use_markup); -gboolean gtk_expander_get_use_markup (GtkExpander *expander); - -void gtk_expander_set_label_widget (GtkExpander *expander, - GtkWidget *label_widget); -GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander); - -G_END_DECLS - -#endif /* __GTK_EXPANDER_H__ */
--- a/pidgin/gtkft.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkft.c Sat Oct 03 21:31:14 2009 +0000 @@ -32,10 +32,8 @@ #include "prpl.h" #include "util.h" -#include "gtkcellrendererprogress.h" #include "gtkft.h" #include "prefs.h" -#include "gtkexpander.h" #include "pidginstock.h" #include "gtkutils.h" @@ -460,27 +458,15 @@ #ifdef _WIN32 /* If using Win32... */ int code; - if (G_WIN32_HAVE_WIDECHAR_API ()) { - wchar_t *wc_filename = g_utf8_to_utf16( - purple_xfer_get_local_filename( - dialog->selected_xfer), - -1, NULL, NULL, NULL); - - code = (int) ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, - SW_SHOW); + wchar_t *wc_filename = g_utf8_to_utf16( + purple_xfer_get_local_filename( + dialog->selected_xfer), + -1, NULL, NULL, NULL); - g_free(wc_filename); - } else { - char *l_filename = g_locale_from_utf8( - purple_xfer_get_local_filename( - dialog->selected_xfer), - -1, NULL, NULL, NULL); + code = (int) ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, + SW_SHOW); - code = (int) ShellExecuteA(NULL, NULL, l_filename, NULL, NULL, - SW_SHOW); - - g_free(l_filename); - } + g_free(wc_filename); if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC) { @@ -621,7 +607,7 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); /* Progress bar column */ - renderer = pidgin_cell_renderer_progress_new(); + renderer = gtk_cell_renderer_progress_new(); column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer, "percentage", COLUMN_PROGRESS, NULL); gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
--- a/pidgin/gtkimhtml.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkimhtml.c Sat Oct 03 21:31:14 2009 +0000 @@ -63,18 +63,8 @@ #include <pango/pango-font.h> -/* GTK+ < 2.4.x hack, see pidgin.h for details. */ -#if (!GTK_CHECK_VERSION(2,4,0)) -#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD -#endif - #define TOOLTIP_TIMEOUT 500 -/* GTK+ 2.0 hack */ -#if (!GTK_CHECK_VERSION(2,2,0)) -#define gtk_widget_get_clipboard(x, y) gtk_clipboard_get(y) -#endif - static GtkTextViewClass *parent_class = NULL; struct scalable_data { @@ -533,10 +523,8 @@ gtk_widget_set_app_paintable (imhtml->tip_window, TRUE); gtk_window_set_resizable (GTK_WINDOW (imhtml->tip_window), FALSE); gtk_widget_set_name (imhtml->tip_window, "gtk-tooltips"); -#if GTK_CHECK_VERSION(2,10,0) gtk_window_set_type_hint (GTK_WINDOW (imhtml->tip_window), GDK_WINDOW_TYPE_HINT_TOOLTIP); -#endif g_signal_connect_swapped (G_OBJECT (imhtml->tip_window), "expose_event", G_CALLBACK (gtk_imhtml_tip_paint), imhtml); @@ -727,32 +715,6 @@ return FALSE; } -#if (!GTK_CHECK_VERSION(2,2,0)) -/* - * XXX - This should be removed eventually. - * - * This function exists to work around a gross bug in GtkTextView. - * Basically, we short circuit ctrl+a and ctrl+end because they make - * el program go boom. - * - * It's supposed to be fixed in gtk2.2. You can view the bug report at - * http://bugzilla.gnome.org/show_bug.cgi?id=107939 - */ -static gboolean -gtk_key_pressed_cb(GtkIMHtml *imhtml, GdkEventKey *event, gpointer data) -{ - if (event->state & GDK_CONTROL_MASK) { - switch (event->keyval) { - case 'a': - case GDK_Home: - case GDK_End: - return TRUE; - } - } - return FALSE; -} -#endif /* !(GTK+ >= 2.2.0) */ - static gint gtk_imhtml_expose_event (GtkWidget *widget, GdkEventExpose *event) @@ -1667,10 +1629,6 @@ g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL); g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL); g_signal_connect(G_OBJECT(imhtml), "enter-notify-event", G_CALLBACK(gtk_enter_event_notify), NULL); -#if (!GTK_CHECK_VERSION(2,2,0)) - /* See the comment for gtk_key_pressed_cb */ - g_signal_connect(G_OBJECT(imhtml), "key_press_event", G_CALLBACK(gtk_key_pressed_cb), NULL); -#endif g_signal_connect(G_OBJECT(imhtml), "button_press_event", G_CALLBACK(gtk_imhtml_button_press_event), NULL); g_signal_connect(G_OBJECT(imhtml->text_buffer), "insert-text", G_CALLBACK(preinsert_cb), imhtml); g_signal_connect(G_OBJECT(imhtml->text_buffer), "delete_range", G_CALLBACK(delete_cb), imhtml); @@ -3666,22 +3624,12 @@ image->filesel = NULL; if (save->data && save->datasize) { -#if GLIB_CHECK_VERSION(2,8,0) g_file_set_contents(filename, save->data, save->datasize, &error); -#else - purple_util_write_data_to_file_absolute(filename, save->data, save->datasize); -#endif } else { gchar *type = NULL; -#if GTK_CHECK_VERSION(2,2,0) GSList *formats = gdk_pixbuf_get_formats(); -#else - char *basename = g_path_get_basename(filename); - char *ext = strrchr(basename, '.'); -#endif char *newfilename; -#if GTK_CHECK_VERSION(2,2,0) while (formats) { GdkPixbufFormat *format = formats->data; gchar **extensions = gdk_pixbuf_format_get_extensions(format); @@ -3708,31 +3656,14 @@ } g_slist_free(formats); -#else - /* this is really ugly code, but I think it will work */ - if (ext) { - ext++; - if (!g_ascii_strcasecmp(ext, "jpeg") || !g_ascii_strcasecmp(ext, "jpg")) - type = g_strdup("jpeg"); - else if (!g_ascii_strcasecmp(ext, "png")) - type = g_strdup("png"); - } - - g_free(basename); -#endif /* If I can't find a valid type, I will just tell the user about it and then assume it's a png */ if (!type){ char *basename, *tmp; char *dirname; -#if GTK_CHECK_VERSION(2,4,0) GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("<span size='larger' weight='bold'>Unrecognized file type</span>\n\nDefaulting to PNG.")); -#else - GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("Unrecognized file type\n\nDefaulting to PNG.")); -#endif g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); gtk_widget_show(dialog); @@ -3761,20 +3692,14 @@ } if (error){ -#if GTK_CHECK_VERSION(2,4,0) GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("<span size='larger' weight='bold'>Error saving image</span>\n\n%s"), error->message); -#else - GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("Error saving image\n\n%s"), error->message); -#endif g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); gtk_widget_show(dialog); g_error_free(error); } } -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ static void image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImageSave *save) { @@ -3788,32 +3713,6 @@ } filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); -#else /* FILECHOOSER */ -static void -image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImageSave *save) -{ - gchar *filename; - GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image; - - filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(image->filesel))); - - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) { - gchar *dirname; - /* append a / is needed */ - if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR) { - dirname = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL); - } else { - dirname = g_strdup(filename); - } - gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), dirname); - g_free(dirname); - g_free(filename); - return; - } -#endif /* FILECHOOSER */ -#if 0 /* mismatched curly braces */ - } -#endif /* * XXX - We should probably prompt the user to determine if they really @@ -3831,15 +3730,6 @@ g_free(filename); } -#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ -static void -image_save_cancel_cb(GtkIMHtmlImage *image) -{ - gtk_widget_destroy(image->filesel); - image->filesel = NULL; -} -#endif /* FILECHOOSER */ - static void gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save) { @@ -3850,7 +3740,6 @@ return; } -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ image->filesel = gtk_file_chooser_dialog_new(_("Save Image"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, @@ -3862,17 +3751,6 @@ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(image->filesel), image->filename); g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(image->filesel)), "response", G_CALLBACK(image_save_check_if_exists_cb), save); -#else /* FILECHOOSER */ - image->filesel = gtk_file_selection_new(_("Save Image")); - if (image->filename != NULL) - gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), image->filename); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)), "delete_event", - G_CALLBACK(image_save_cancel_cb), image); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->cancel_button), - "clicked", G_CALLBACK(image_save_cancel_cb), image); - g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->ok_button), "clicked", - G_CALLBACK(image_save_check_if_exists_cb), save); -#endif /* FILECHOOSER */ gtk_widget_show(image->filesel); } @@ -5042,9 +4920,7 @@ if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) { ebox = gtk_event_box_new(); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); -#endif gtk_widget_show(ebox); }
--- a/pidgin/gtkimhtmltoolbar.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Oct 03 21:31:14 2009 +0000 @@ -478,35 +478,19 @@ GtkTextIter iter; GtkTextMark *ins; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ if (response != GTK_RESPONSE_ACCEPT) -#else /* FILECHOOSER */ - if (response != GTK_RESPONSE_OK) -#endif /* FILECHOOSER */ { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); return; } -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); -#else /* FILECHOOSER */ - filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget))); -#endif /* FILECHOOSER */ if (filename == NULL) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); return; } -#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ - if (pidgin_check_if_dir(filename, GTK_FILE_SELECTION(widget))) { - g_free(filename); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); - return; - } -#endif /* FILECHOOSER */ - /* The following triggers a callback that closes the widget */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); @@ -549,7 +533,6 @@ GtkWidget *window; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->image))) { -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ window = gtk_file_chooser_dialog_new(_("Insert Image"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, @@ -559,12 +542,6 @@ gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT); g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(window)), "response", G_CALLBACK(do_insert_image_cb), toolbar); -#else /* FILECHOOSER */ - window = gtk_file_selection_new(_("Insert Image")); - gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_OK); - g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)), - "response", G_CALLBACK(do_insert_image_cb), toolbar); -#endif /* FILECHOOSER */ gtk_widget_show(window); toolbar->image_dialog = window; @@ -1457,9 +1434,7 @@ G_CALLBACK(purple_prefs_trigger_callback), PIDGIN_PREFS_ROOT "/conversations/toolbar/wide", NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE); -#endif gtk_widget_add_events(event, GDK_BUTTON_PRESS_MASK); gtk_box_pack_start(GTK_BOX(hbox), event, TRUE, TRUE, 0);
--- a/pidgin/gtklog.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtklog.c Sat Oct 03 21:31:14 2009 +0000 @@ -252,7 +252,6 @@ GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter); gboolean first = !gtk_tree_path_prev(path); -#if GTK_CHECK_VERSION(2,2,0) if (!gtk_tree_store_remove(treestore, iter) && first) { /* iter was the last child at its level */ @@ -263,9 +262,7 @@ gtk_tree_store_remove(treestore, iter); } } -#else - gtk_tree_store_remove(treestore, iter); -#endif + gtk_tree_path_free(path); }
--- a/pidgin/gtkmain.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkmain.c Sat Oct 03 21:31:14 2009 +0000 @@ -743,9 +743,7 @@ return 1; } -#if GLIB_CHECK_VERSION(2,2,0) g_set_application_name(_("Pidgin")); -#endif /* glib-2.0 >= 2.2.0 */ #ifdef _WIN32 winpidgin_init(hint);
--- a/pidgin/gtkmenutray.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkmenutray.c Sat Oct 03 21:31:14 2009 +0000 @@ -138,9 +138,7 @@ static void pidgin_menu_tray_init(PidginMenuTray *menu_tray) { GtkWidget *widget = GTK_WIDGET(menu_tray); -#if GTK_CHECK_VERSION(2,2,0) GtkSettings *settings; -#endif gint height = -1; gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); @@ -148,15 +146,11 @@ if(!GTK_IS_WIDGET(menu_tray->tray)) menu_tray->tray = gtk_hbox_new(FALSE, 0); -#if GTK_CHECK_VERSION(2,2,0) settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, NULL, &height)) -#else - if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) -#endif { gtk_widget_set_size_request(widget, -1, height); }
--- a/pidgin/gtknotify.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtknotify.c Sat Oct 03 21:31:14 2009 +0000 @@ -627,12 +627,7 @@ PIDGIN_MAIL_DATA, &data, -1); if (data && data->account == account) { if (clear) { -#if GTK_CHECK_VERSION(2,2,0) advanced = gtk_tree_store_remove(treemodel, &iter); -#else - gtk_tree_store_remove(treemodel, &iter); - advanced = (iter.stamp == 0) ? FALSE : TRUE; -#endif mail_dialog->total_count -= data->count; if (data->purple_has_handle)
--- a/pidgin/gtkplugin.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkplugin.c Sat Oct 03 21:31:14 2009 +0000 @@ -670,15 +670,11 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); website_button = gtk_event_box_new(); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(website_button), FALSE); -#endif plugin_website = GTK_LABEL(gtk_label_new(NULL)); -#if GTK_CHECK_VERSION(2,6,0) g_object_set(G_OBJECT(plugin_website), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); -#endif gtk_misc_set_alignment(GTK_MISC(plugin_website), 0, 0); gtk_container_add(GTK_CONTAINER(website_button), GTK_WIDGET(plugin_website)); @@ -778,10 +774,8 @@ "markup", 1, "foreground-set", 3, NULL); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_column_set_expand (col, TRUE); g_object_set(rendt, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col); gtk_tree_view_column_set_sort_column_id(col, 1); g_object_unref(G_OBJECT(ls));
--- a/pidgin/gtkpounce.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkpounce.c Sat Oct 03 21:31:14 2009 +0000 @@ -1063,15 +1063,6 @@ return FALSE; } -#if !GTK_CHECK_VERSION(2,2,0) -static void -count_selected_helper(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer user_data) -{ - (*(gint *)user_data)++; -} -#endif - static void pounces_manager_connection_cb(PurpleConnection *gc, GtkWidget *add_button) { @@ -1163,11 +1154,7 @@ PouncesManager *dialog = user_data; int num_selected = 0; -#if GTK_CHECK_VERSION(2,2,0) num_selected = gtk_tree_selection_count_selected_rows(sel); -#else - gtk_tree_selection_selected_foreach(sel, count_selected_helper, &num_selected); -#endif gtk_widget_set_sensitive(dialog->modify_button, (num_selected > 0)); gtk_widget_set_sensitive(dialog->delete_button, (num_selected > 0)); @@ -1549,34 +1536,19 @@ PROCESS_INFORMATION pi; BOOL retval; gchar *message = NULL; + STARTUPINFOW si; + + wchar_t *wc_cmd = g_utf8_to_utf16(command, + -1, NULL, NULL, NULL); memset(&pi, 0, sizeof(pi)); - - if (G_WIN32_HAVE_WIDECHAR_API ()) { - STARTUPINFOW si; - wchar_t *wc_cmd = g_utf8_to_utf16(command, - -1, NULL, NULL, NULL); - - memset(&si, 0 , sizeof(si)); - si.cb = sizeof(si); + memset(&si, 0 , sizeof(si)); + si.cb = sizeof(si); - retval = CreateProcessW(NULL, wc_cmd, NULL, - NULL, 0, 0, NULL, NULL, - &si, &pi); - g_free(wc_cmd); - } else { - STARTUPINFOA si; - char *l_cmd = g_locale_from_utf8(command, - -1, NULL, NULL, NULL); - - memset(&si, 0 , sizeof(si)); - si.cb = sizeof(si); - - retval = CreateProcessA(NULL, l_cmd, NULL, - NULL, 0, 0, NULL, NULL, - &si, &pi); - g_free(l_cmd); - } + retval = CreateProcessW(NULL, wc_cmd, NULL, + NULL, 0, 0, NULL, NULL, + &si, &pi); + g_free(wc_cmd); if (retval) { CloseHandle(pi.hProcess);
--- a/pidgin/gtkprefs.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkprefs.c Sat Oct 03 21:31:14 2009 +0000 @@ -1532,10 +1532,8 @@ _("Bottom"), GTK_POS_BOTTOM, _("Left"), GTK_POS_LEFT, _("Right"), GTK_POS_RIGHT, -#if GTK_CHECK_VERSION(2,6,0) _("Left Vertical"), GTK_POS_LEFT|8, _("Right Vertical"), GTK_POS_RIGHT|8, -#endif NULL); gtk_size_group_add_widget(sg, label); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); @@ -1556,14 +1554,12 @@ return ret; } -#if GTK_CHECK_VERSION(2,4,0) static void pidgin_custom_font_set(GtkFontButton *font_button, gpointer nul) { purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", gtk_font_button_get_font_name(font_button)); } -#endif static GtkWidget * conv_page(void) @@ -1577,11 +1573,9 @@ GtkWidget *imhtml; GtkWidget *frame; -#if GTK_CHECK_VERSION(2,4,0) GtkWidget *hbox; GtkWidget *font_button; const char *font_name; -#endif ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); @@ -1620,7 +1614,6 @@ PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 1, 8, NULL); -#if GTK_CHECK_VERSION(2,4,0) vbox = pidgin_make_frame(ret, _("Font")); if (purple_running_gnome()) fontpref = pidgin_prefs_checkbox(_("Use document font from _theme"), PIDGIN_PREFS_ROOT "/conversations/use_theme_font", vbox); @@ -1640,7 +1633,6 @@ gtk_widget_set_sensitive(hbox, FALSE); g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox); g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL); -#endif vbox = pidgin_make_frame(ret, _("Default Formatting")); gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START); @@ -2821,12 +2813,7 @@ static int prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) { -#if GTK_CHECK_VERSION(2,4,0) return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); -#else - gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); - return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page); -#endif } static void
--- a/pidgin/gtkrequest.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkrequest.c Sat Oct 03 21:31:14 2009 +0000 @@ -595,9 +595,7 @@ /* Create the dialog. */ data->dialog = dialog = gtk_dialog_new(); -#if GTK_CHECK_VERSION(2,10,0) gtk_window_set_deletable(GTK_WINDOW(data->dialog), FALSE); -#endif if (title != NULL) gtk_window_set_title(GTK_WINDOW(dialog), title); @@ -1445,7 +1443,6 @@ } } -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ static void file_ok_check_if_exists_cb(GtkWidget *widget, gint response, PidginRequestData *data) { @@ -1470,51 +1467,6 @@ } g_free(current_folder); } - -#else /* FILECHOOSER */ - -static void -file_ok_check_if_exists_cb(GtkWidget *button, PidginRequestData *data) -{ - const gchar *name; - gchar *current_folder; - - generic_response_start(data); - - name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog)); - - /* If name is a directory then change directories */ - if (data->type == PURPLE_REQUEST_FILE) { - if (pidgin_check_if_dir(name, GTK_FILE_SELECTION(data->dialog))) - return; - } - - current_folder = g_path_get_dirname(name); - - g_free(data->u.file.name); - if (data->type == PURPLE_REQUEST_FILE) - data->u.file.name = g_strdup(name); - else - { - if (g_file_test(name, G_FILE_TEST_IS_DIR)) - data->u.file.name = g_strdup(name); - else - data->u.file.name = g_strdup(current_folder); - } - - if (current_folder != NULL) { - if (data->u.file.savedialog) { - purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", current_folder); - } else { - purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", current_folder); - } - g_free(current_folder); - } - -#endif /* FILECHOOSER */ -#if 0 /* mismatched curly braces */ - } -#endif if ((data->u.file.savedialog == TRUE) && (g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) { purple_request_action(data, NULL, _("That file already exists"), @@ -1527,20 +1479,6 @@ file_yes_no_cb(data, 1); } -#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ -static gboolean -file_cancel_cb(PidginRequestData *data) -{ - generic_response_start(data); - - if (data->cbs[0] != NULL) - ((PurpleRequestFileCb)data->cbs[0])(data->user_data, NULL); - - purple_request_close(data->type, data); - return FALSE; -} -#endif /* FILECHOOSER */ - static void * pidgin_request_file(const char *title, const char *filename, gboolean savedialog, @@ -1551,9 +1489,7 @@ PidginRequestData *data; GtkWidget *filesel; const gchar *current_folder; -#if GTK_CHECK_VERSION(2,4,0) gboolean folder_set = FALSE; -#endif data = g_new0(PidginRequestData, 1); data->type = PURPLE_REQUEST_FILE; @@ -1564,7 +1500,6 @@ data->cbs[1] = ok_cb; data->u.file.savedialog = savedialog; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ filesel = gtk_file_chooser_dialog_new( title ? title : (savedialog ? _("Save File...") : _("Open File...")), @@ -1610,30 +1545,6 @@ #endif g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response", G_CALLBACK(file_ok_check_if_exists_cb), data); -#else /* FILECHOOSER */ - filesel = gtk_file_selection_new( - title ? title : (savedialog ? _("Save File...") - : _("Open File..."))); - if (savedialog) { - current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder"); - } else { - current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder"); - } - if (current_folder != NULL) { - gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S); - gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), path); - g_free(path); - } - if (filename != NULL) - gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), filename); - - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)), "delete_event", - G_CALLBACK(file_cancel_cb), data); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), - "clicked", G_CALLBACK(file_cancel_cb), data); - g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", - G_CALLBACK(file_ok_check_if_exists_cb), data); -#endif /* FILECHOOSER */ pidgin_auto_parent_window(filesel); @@ -1661,7 +1572,6 @@ data->cbs[1] = ok_cb; data->u.file.savedialog = FALSE; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ dirsel = gtk_file_chooser_dialog_new( title ? title : _("Select Folder..."), NULL, @@ -1676,16 +1586,6 @@ g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(dirsel)), "response", G_CALLBACK(file_ok_check_if_exists_cb), data); -#else - dirsel = gtk_file_selection_new(title ? title : _("Select Folder...")); - - g_signal_connect_swapped(G_OBJECT(dirsel), "delete_event", - G_CALLBACK(file_cancel_cb), data); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(dirsel)->cancel_button), - "clicked", G_CALLBACK(file_cancel_cb), data); - g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dirsel)->ok_button), "clicked", - G_CALLBACK(file_ok_check_if_exists_cb), data); -#endif data->dialog = dirsel; pidgin_auto_parent_window(dirsel);
--- a/pidgin/gtksavedstatuses.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtksavedstatuses.c Sat Oct 03 21:31:14 2009 +0000 @@ -34,7 +34,6 @@ #include "util.h" #include "gtkblist.h" -#include "gtkexpander.h" #include "pidgin.h" #include "gtkimhtml.h" #include "gtkimhtmltoolbar.h" @@ -180,23 +179,6 @@ return FALSE; } -#if !GTK_CHECK_VERSION(2,2,0) -static void -count_selected_helper(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer user_data) -{ - (*(gint *)user_data)++; -} - -static void -list_selected_helper(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer user_data) -{ - GList **list = (GList **)user_data; - *list = g_list_append(*list, gtk_tree_path_copy(path)); -} -#endif - static void status_window_use_cb(GtkButton *button, StatusWindow *dialog) { @@ -207,11 +189,7 @@ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); -#if GTK_CHECK_VERSION(2,2,0) num_selected = gtk_tree_selection_count_selected_rows(selection); -#else - gtk_tree_selection_selected_foreach(selection, count_selected_helper, &num_selected); -#endif if (num_selected != 1) /* * This shouldn't happen because the "Use" button should have @@ -219,11 +197,7 @@ */ return; -#if GTK_CHECK_VERSION(2,2,0) list = gtk_tree_selection_get_selected_rows(selection, NULL); -#else - gtk_tree_selection_selected_foreach(selection, list_selected_helper, &list); -#endif if (gtk_tree_model_get_iter(GTK_TREE_MODEL(dialog->model), &iter, list->data)) @@ -311,11 +285,7 @@ gpointer handle; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); -#if GTK_CHECK_VERSION(2,2,0) sel_paths = gtk_tree_selection_get_selected_rows(selection, NULL); -#else - gtk_tree_selection_selected_foreach(selection, list_selected_helper, &sel_paths); -#endif /* This is ugly because we're not allowed to modify the model from within * gtk_tree_selection_selected_foreach() and the GtkTreePaths can become invalid @@ -365,11 +335,7 @@ int num_selected; GtkTreeModel *model = GTK_TREE_MODEL(dialog->model); -#if GTK_CHECK_VERSION(2,2,0) sel_paths = gtk_tree_selection_get_selected_rows(sel, NULL); -#else - gtk_tree_selection_selected_foreach(sel, list_selected_helper, &sel_paths); -#endif for (tmp = sel_paths, num_selected = 0; tmp; tmp = tmp->next, num_selected++) { GtkTreeIter iter; @@ -521,9 +487,7 @@ gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_add_attribute(column, renderer, "text", STATUS_WINDOW_COLUMN_TITLE); -#if GTK_CHECK_VERSION(2,6,0) g_object_set(renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Type")); @@ -550,9 +514,7 @@ gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_add_attribute(column, renderer, "text", STATUS_WINDOW_COLUMN_MESSAGE); -#if GTK_CHECK_VERSION(2,6,0) g_object_set(renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif /* Enable CTRL+F searching */ gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), STATUS_WINDOW_COLUMN_TITLE);
--- a/pidgin/gtkscrollbook.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkscrollbook.c Sat Oct 03 21:31:14 2009 +0000 @@ -80,11 +80,7 @@ { int index, count; index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); -#if GTK_CHECK_VERSION(2,2,0) count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook)); -#else - count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children); -#endif if (index + 1 < count) gtk_notebook_set_current_page(GTK_NOTEBOOK(scroll_book->notebook), index + 1); @@ -130,11 +126,7 @@ { int count; int index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); -#if GTK_CHECK_VERSION(2,2,0) count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook)); -#else - count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children); -#endif refresh_scroll_box(scroll_book, index, count); } @@ -149,11 +141,7 @@ switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, PidginScrollBook *scroll_book) { int count; -#if GTK_CHECK_VERSION(2,2,0) count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook)); -#else - count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children); -#endif refresh_scroll_box(scroll_book, page_num, count); } @@ -268,9 +256,7 @@ /* Close */ eb = gtk_event_box_new(); gtk_box_pack_end(GTK_BOX(scroll_book->hbox), eb, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(eb), FALSE); -#endif gtk_widget_set_events(eb, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); close_button = gtk_label_new("×"); g_signal_connect(G_OBJECT(eb), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_button);
--- a/pidgin/gtksession.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtksession.c Sat Oct 03 21:31:14 2009 +0000 @@ -163,10 +163,8 @@ ret[j++] = g_strdup(config_dir); } -#if GTK_CHECK_VERSION(2,2,0) ret[j++] = g_strdup("--display"); ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default())); -#endif ret[j++] = NULL;
--- a/pidgin/gtksound.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtksound.c Sat Oct 03 21:31:14 2009 +0000 @@ -539,18 +539,12 @@ #else /* _WIN32 */ purple_debug_info("sound", "Playing %s\n", filename); - if (G_WIN32_HAVE_WIDECHAR_API ()) { + { wchar_t *wc_filename = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL); if (!PlaySoundW(wc_filename, NULL, SND_ASYNC | SND_FILENAME)) purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n"); g_free(wc_filename); - } else { - char *l_filename = g_locale_from_utf8(filename, - -1, NULL, NULL, NULL); - if (!PlaySoundA(l_filename, NULL, SND_ASYNC | SND_FILENAME)) - purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n"); - g_free(l_filename); } #endif /* _WIN32 */
--- a/pidgin/gtkstatusbox.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkstatusbox.c Sat Oct 03 21:31:14 2009 +0000 @@ -1169,7 +1169,6 @@ return FALSE; } -#if GTK_CHECK_VERSION(2,6,0) static gboolean dropdown_store_row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer data) @@ -1183,7 +1182,6 @@ return FALSE; } -#endif static void cache_pixbufs(PidginStatusBox *status_box) @@ -1293,11 +1291,9 @@ static void pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, int *width, int *height) { -#if GTK_CHECK_VERSION(2,2,0) GdkScreen *screen; gint monitor_num; GdkRectangle monitor; -#endif GtkRequisition popup_req; GtkPolicyType hpolicy, vpolicy; @@ -1323,7 +1319,6 @@ *height = popup_req.height; -#if GTK_CHECK_VERSION(2,2,0) screen = gtk_widget_get_screen (GTK_WIDGET (status_box)); monitor_num = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (status_box)->window); @@ -1356,7 +1351,6 @@ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (status_box->scrolled_window), hpolicy, vpolicy); } -#endif } static gboolean @@ -1364,29 +1358,20 @@ guint32 activate_time, gboolean grab_keyboard) { - if ((gdk_pointer_grab (window, TRUE, + if ((gdk_pointer_grab (window, TRUE, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, NULL, NULL, activate_time) == 0)) - { - if (!grab_keyboard || - gdk_keyboard_grab (window, TRUE, - activate_time) == 0) - return TRUE; - else { -#if GTK_CHECK_VERSION(2,2,0) - gdk_display_pointer_ungrab (gdk_drawable_get_display (window), - activate_time); -#else - gdk_pointer_ungrab(activate_time); - gdk_keyboard_ungrab(activate_time); -#endif - return FALSE; + if (!grab_keyboard || gdk_keyboard_grab (window, TRUE, activate_time) == 0) + return TRUE; + else { + gdk_display_pointer_ungrab (gdk_drawable_get_display (window), activate_time); + return FALSE; + } } - } - - return FALSE; + + return FALSE; } @@ -1781,9 +1766,7 @@ gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->vsep, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->arrow, FALSE, FALSE, 0); gtk_widget_show_all(status_box->toggle_button); -#if GTK_CHECK_VERSION(2,4,0) gtk_button_set_focus_on_click(GTK_BUTTON(status_box->toggle_button), FALSE); -#endif text_rend = gtk_cell_renderer_text_new(); icon_rend = gtk_cell_renderer_pixbuf_new(); @@ -1797,14 +1780,10 @@ } gtk_window_set_resizable (GTK_WINDOW (status_box->popup_window), FALSE); -#if GTK_CHECK_VERSION(2,10,0) gtk_window_set_type_hint (GTK_WINDOW (status_box->popup_window), GDK_WINDOW_TYPE_HINT_POPUP_MENU); -#endif -#if GTK_CHECK_VERSION(2,2,0) gtk_window_set_screen (GTK_WINDOW (status_box->popup_window), gtk_widget_get_screen (GTK_WIDGET (status_box))); -#endif status_box->popup_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (status_box->popup_frame), GTK_SHADOW_ETCHED_IN); @@ -1831,10 +1810,8 @@ gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (status_box->tree_view), FALSE); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (status_box->tree_view), TRUE); -#endif gtk_tree_view_set_model (GTK_TREE_VIEW (status_box->tree_view), GTK_TREE_MODEL(status_box->dropdown_store)); status_box->column = gtk_tree_view_column_new (); @@ -1852,9 +1829,7 @@ gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(status_box->tree_view), pidgin_tree_view_search_equal_func, NULL, NULL); -#if GTK_CHECK_VERSION(2, 6, 0) g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif status_box->icon_rend = gtk_cell_renderer_pixbuf_new(); status_box->text_rend = gtk_cell_renderer_text_new(); @@ -1865,9 +1840,7 @@ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "stock-id", ICON_STOCK_COLUMN, NULL); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, "markup", TEXT_COLUMN, NULL); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), emblem_rend, "pixbuf", EMBLEM_COLUMN, "visible", EMBLEM_VISIBLE_COLUMN, NULL); -#if GTK_CHECK_VERSION(2, 6, 0) g_object_set(status_box->text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif status_box->vbox = gtk_vbox_new(0, FALSE); status_box->sw = pidgin_create_imhtml(FALSE, &status_box->imhtml, NULL, NULL); @@ -1912,9 +1885,7 @@ g_signal_connect(G_OBJECT(status_box->tree_view), "cursor-changed", G_CALLBACK(treeview_cursor_changed_cb), status_box->dropdown_store); -#if GTK_CHECK_VERSION(2,6,0) gtk_tree_view_set_row_separator_func(GTK_TREE_VIEW(status_box->tree_view), dropdown_store_row_separator_func, NULL, NULL); -#endif status_box->token_status_account = check_active_accounts_for_identical_statuses(); @@ -2198,14 +2169,12 @@ { /* Don't do anything unless GTK actually supports * gtk_combo_box_set_row_separator_func */ -#if GTK_CHECK_VERSION(2,6,0) GtkTreeIter iter; gtk_list_store_append(status_box->dropdown_store, &iter); gtk_list_store_set(status_box->dropdown_store, &iter, TYPE_COLUMN, PIDGIN_STATUS_BOX_TYPE_SEPARATOR, -1); -#endif } void @@ -2229,7 +2198,6 @@ static void pixbuf_size_prepared_cb(GdkPixbufLoader *loader, int width, int height, gpointer data) { -#if GTK_CHECK_VERSION(2,2,0) int w, h; GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM); gtk_icon_size_lookup(icon_size, &w, &h); @@ -2238,7 +2206,6 @@ else if (width > height) h = height * w / width; gdk_pixbuf_loader_set_size(loader, w, h); -#endif } static void
--- a/pidgin/gtkutils.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkutils.c Sat Oct 03 21:31:14 2009 +0000 @@ -1261,7 +1261,6 @@ gboolean *push_in, gpointer data) { -#if GTK_CHECK_VERSION(2,2,0) GtkWidget *widget; GtkRequisition requisition; GdkScreen *screen; @@ -1402,7 +1401,6 @@ { *y = monitor.y; } -#endif } @@ -1644,7 +1642,6 @@ char key[64]; const char *itemname = NULL; -#if GTK_CHECK_VERSION(2,6,0) const char * const *langs; int i; langs = g_get_language_names(); @@ -1653,15 +1650,7 @@ itemname = purple_desktop_item_get_string(item, key); break; } -#else - const char *lang = g_getenv("LANG"); - char *dot; - dot = strchr(lang, '.'); - if (dot) - *dot = '\0'; - g_snprintf(key, sizeof(key), "Name[%s]", lang); - itemname = purple_desktop_item_get_string(item, key); -#endif + if (!itemname) itemname = purple_desktop_item_get_string(item, "Name"); @@ -1678,10 +1667,13 @@ purple_desktop_item_get_string(item, "URL"), itemname); break; default: - /* I don't know if we really want to do anything here. Most of the desktop item types are crap like - * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really - * send. The only logical one is "Application," but do we really want to send a binary and nothing else? - * Probably not. I'll just give an error and return. */ + /* I don't know if we really want to do anything here. Most of + * the desktop item types are crap like "MIME Type" (I have no + * clue how that would be a desktop item) and "Comment"... + * nothing we can really send. The only logical one is + * "Application," but do we really want to send a binary and + * nothing else? Probably not. I'll just give an error and + * return. */ /* The original patch sent the icon used by the launcher. That's probably wrong */ purple_notify_error(NULL, NULL, _("Cannot send launcher"), _("You dragged a desktop launcher. Most " @@ -1876,10 +1868,6 @@ return menuitem; } -#if GTK_CHECK_VERSION(2,3,0) -# define NEW_STYLE_COMPLETION -#endif - typedef struct { GtkWidget *entry; @@ -1888,97 +1876,9 @@ PidginFilterBuddyCompletionEntryFunc filter_func; gpointer filter_func_user_data; -#ifdef NEW_STYLE_COMPLETION GtkListStore *store; -#else - GCompletion *completion; - gboolean completion_started; - GList *log_items; -#endif /* NEW_STYLE_COMPLETION */ } PidginCompletionData; -#ifndef NEW_STYLE_COMPLETION -static gboolean -completion_entry_event(GtkEditable *entry, GdkEventKey *event, - PidginCompletionData *data) -{ - int pos, end_pos; - - if (event->type == GDK_KEY_PRESS && event->keyval == GDK_Tab) - { - gtk_editable_get_selection_bounds(entry, &pos, &end_pos); - - if (data->completion_started && - pos != end_pos && pos > 1 && - end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry)))) - { - gtk_editable_select_region(entry, 0, 0); - gtk_editable_set_position(entry, -1); - - return TRUE; - } - } - else if (event->type == GDK_KEY_PRESS && event->length > 0) - { - char *prefix, *nprefix; - - gtk_editable_get_selection_bounds(entry, &pos, &end_pos); - - if (data->completion_started && - pos != end_pos && pos > 1 && - end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry)))) - { - char *temp; - - temp = gtk_editable_get_chars(entry, 0, pos); - prefix = g_strconcat(temp, event->string, NULL); - g_free(temp); - } - else if (pos == end_pos && pos > 1 && - end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry)))) - { - prefix = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)), - event->string, NULL); - } - else - return FALSE; - - pos = strlen(prefix); - nprefix = NULL; - - g_completion_complete(data->completion, prefix, &nprefix); - - if (nprefix != NULL) - { - gtk_entry_set_text(GTK_ENTRY(entry), nprefix); - gtk_editable_set_position(entry, pos); - gtk_editable_select_region(entry, pos, -1); - - data->completion_started = TRUE; - - g_free(nprefix); - g_free(prefix); - - return TRUE; - } - - g_free(prefix); - } - - return FALSE; -} - -static void -destroy_completion_data(GtkWidget *w, PidginCompletionData *data) -{ - g_list_foreach(data->completion->items, (GFunc)g_free, NULL); - g_completion_free(data->completion); - - g_free(data); -} -#endif /* !NEW_STYLE_COMPLETION */ - -#ifdef NEW_STYLE_COMPLETION static gboolean buddyname_completion_match_func(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer user_data) { @@ -2112,7 +2012,6 @@ g_free(normalized_buddyname); } -#endif /* NEW_STYLE_COMPLETION */ static void get_log_set_name(PurpleLogSet *set, gpointer value, PidginCompletionData *data) { @@ -2127,14 +2026,8 @@ entry.entry.logged_buddy = set; if (filter_func(&entry, user_data)) { -#ifdef NEW_STYLE_COMPLETION add_buddyname_autocomplete_entry(data->store, NULL, NULL, set->account, set->name); -#else - /* Steal the name for the GCompletion. */ - data->log_items = g_list_append(data->log_items, set->name); - set->name = set->normalized_name = NULL; -#endif /* NEW_STYLE_COMPLETION */ } } } @@ -2147,14 +2040,7 @@ gpointer user_data = data->filter_func_user_data; GHashTable *sets; -#ifdef NEW_STYLE_COMPLETION gtk_list_store_clear(data->store); -#else - GList *item = g_list_append(NULL, NULL); - - g_list_foreach(data->completion->items, (GFunc)g_free, NULL); - g_completion_clear_items(data->completion); -#endif /* NEW_STYLE_COMPLETION */ for (gnode = purple_get_blist()->root; gnode != NULL; gnode = gnode->next) { @@ -2173,35 +2059,21 @@ entry.entry.buddy = (PurpleBuddy *) bnode; if (filter_func(&entry, user_data)) { -#ifdef NEW_STYLE_COMPLETION add_buddyname_autocomplete_entry(data->store, ((PurpleContact *)cnode)->alias, purple_buddy_get_contact_alias(entry.entry.buddy), entry.entry.buddy->account, entry.entry.buddy->name ); -#else - item->data = g_strdup(entry.entry.buddy->name); - g_completion_add_items(data->completion, item); -#endif /* NEW_STYLE_COMPLETION */ } } } } -#ifndef NEW_STYLE_COMPLETION - g_list_free(item); - data->log_items = NULL; -#endif /* NEW_STYLE_COMPLETION */ - sets = purple_log_get_log_sets(); g_hash_table_foreach(sets, (GHFunc)get_log_set_name, data); g_hash_table_destroy(sets); -#ifndef NEW_STYLE_COMPLETION - g_completion_add_items(data->completion, data->log_items); - g_list_free(data->log_items); -#endif /* NEW_STYLE_COMPLETION */ } static void @@ -2222,7 +2094,6 @@ { PidginCompletionData *data; -#ifdef NEW_STYLE_COMPLETION /* * Store the displayed completion value, the buddy name, the UTF-8 * normalized & casefolded buddy name, the UTF-8 normalized & @@ -2266,33 +2137,6 @@ gtk_entry_completion_set_text_column(completion, 0); -#else /* !NEW_STYLE_COMPLETION */ - - data = g_new0(PidginCompletionData, 1); - - data->entry = entry; - data->accountopt = accountopt; - if (filter_func == NULL) { - data->filter_func = pidgin_screenname_autocomplete_default_filter; - data->filter_func_user_data = NULL; - } else { - data->filter_func = filter_func; - data->filter_func_user_data = user_data; - } - data->completion = g_completion_new(NULL); - data->completion_started = FALSE; - - add_completion_list(data); - - g_completion_set_compare(data->completion, g_ascii_strncasecmp); - - g_signal_connect(G_OBJECT(entry), "event", - G_CALLBACK(completion_entry_event), data); - g_signal_connect(G_OBJECT(entry), "destroy", - G_CALLBACK(destroy_completion_data), data); - -#endif /* !NEW_STYLE_COMPLETION */ - purple_signal_connect(purple_connections_get_handle(), "signed-on", entry, PURPLE_CALLBACK(repopulate_autocomplete), data); purple_signal_connect(purple_connections_get_handle(), "signed-off", entry, @@ -2336,11 +2180,7 @@ gdk_window_set_cursor(widget->window, cursor); gdk_cursor_unref(cursor); -#if GTK_CHECK_VERSION(2,4,0) gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window))); -#else - gdk_flush(); -#endif } void pidgin_clear_cursor(GtkWidget *widget) @@ -2361,23 +2201,6 @@ gpointer data; }; -#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ -static void -icon_filesel_delete_cb(GtkWidget *w, struct _icon_chooser *dialog) -{ - if (dialog->icon_filesel != NULL) - gtk_widget_destroy(dialog->icon_filesel); - - if (dialog->callback) - dialog->callback(NULL, dialog->data); - - g_free(dialog); -} -#endif /* FILECHOOSER */ - - - -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ static void icon_filesel_choose_cb(GtkWidget *widget, gint response, struct _icon_chooser *dialog) { @@ -2401,33 +2224,7 @@ g_free(current_folder); } -#else /* FILECHOOSER */ -static void -icon_filesel_choose_cb(GtkWidget *w, struct _icon_chooser *dialog) -{ - char *filename, *current_folder; - - filename = g_strdup(gtk_file_selection_get_filename( - GTK_FILE_SELECTION(dialog->icon_filesel))); - - /* If they typed in a directory, change there */ - if (pidgin_check_if_dir(filename, - GTK_FILE_SELECTION(dialog->icon_filesel))) - { - g_free(filename); - return; - } - - current_folder = g_path_get_dirname(filename); - if (current_folder != NULL) { - purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", current_folder); - g_free(current_folder); - } - -#endif /* FILECHOOSER */ -#if 0 /* mismatched curly braces */ - } -#endif + if (dialog->callback) dialog->callback(filename, dialog->data); gtk_widget_destroy(dialog->icon_filesel); @@ -2437,11 +2234,7 @@ static void -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ icon_preview_change_cb(GtkFileChooser *widget, struct _icon_chooser *dialog) -#else /* FILECHOOSER */ -icon_preview_change_cb(GtkTreeSelection *sel, struct _icon_chooser *dialog) -#endif /* FILECHOOSER */ { GdkPixbuf *pixbuf, *scale; int height, width; @@ -2449,13 +2242,8 @@ struct stat st; char *filename; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ filename = gtk_file_chooser_get_preview_filename( GTK_FILE_CHOOSER(dialog->icon_filesel)); -#else /* FILECHOOSER */ - filename = g_strdup(gtk_file_selection_get_filename( - GTK_FILE_SELECTION(dialog->icon_filesel))); -#endif /* FILECHOOSER */ if (!filename || g_stat(filename, &st) || !(pixbuf = gdk_pixbuf_new_from_file(filename, NULL))) { @@ -2491,20 +2279,13 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) { struct _icon_chooser *dialog = g_new0(struct _icon_chooser, 1); -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ GtkWidget *vbox; -#else - GtkWidget *hbox; - GtkWidget *tv; - GtkTreeSelection *sel; -#endif /* FILECHOOSER */ const char *current_folder; dialog->callback = callback; dialog->data = data; current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder"); -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"), parent, @@ -2535,39 +2316,6 @@ g_signal_connect(G_OBJECT(dialog->icon_filesel), "response", G_CALLBACK(icon_filesel_choose_cb), dialog); icon_preview_change_cb(NULL, dialog); -#else /* FILECHOOSER */ - dialog->icon_filesel = gtk_file_selection_new(_("Buddy Icon")); - dialog->icon_preview = gtk_image_new(); - dialog->icon_text = gtk_label_new(NULL); - if ((current_folder != NULL) && (*current_folder != '\0')) - gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog->icon_filesel), - current_folder); - - gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview),-1, 50); - hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); - gtk_box_pack_start( - GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox), - hbox, FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_preview, - FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_text, FALSE, FALSE, 0); - - tv = GTK_FILE_SELECTION(dialog->icon_filesel)->file_list; - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); - - g_signal_connect(G_OBJECT(sel), "changed", - G_CALLBACK(icon_preview_change_cb), dialog); - g_signal_connect( - G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->ok_button), - "clicked", - G_CALLBACK(icon_filesel_choose_cb), dialog); - g_signal_connect( - G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->cancel_button), - "clicked", - G_CALLBACK(icon_filesel_delete_cb), dialog); - g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy", - G_CALLBACK(icon_filesel_delete_cb), dialog); -#endif /* FILECHOOSER */ #ifdef _WIN32 g_signal_connect(G_OBJECT(dialog->icon_filesel), "show", @@ -2578,7 +2326,6 @@ } -#if GTK_CHECK_VERSION(2,2,0) static gboolean str_array_match(char **a, char **b) { @@ -2592,22 +2339,16 @@ return TRUE; return FALSE; } -#endif gpointer pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len) { PurplePluginProtocolInfo *prpl_info; -#if GTK_CHECK_VERSION(2,2,0) char **prpl_formats; int width, height; char **pixbuf_formats = NULL; GdkPixbufFormat *format; GdkPixbuf *pixbuf; -#if !GTK_CHECK_VERSION(2,4,0) - GdkPixbufLoader *loader; -#endif -#endif gchar *contents; gsize length; @@ -2616,22 +2357,8 @@ g_return_val_if_fail(prpl_info->icon_spec.format != NULL, NULL); -#if GTK_CHECK_VERSION(2,2,0) -#if GTK_CHECK_VERSION(2,4,0) format = gdk_pixbuf_get_file_info(path, &width, &height); -#else - loader = gdk_pixbuf_loader_new(); - if (g_file_get_contents(path, &contents, &length, NULL)) { - gdk_pixbuf_loader_write(loader, contents, length, NULL); - g_free(contents); - } - gdk_pixbuf_loader_close(loader, NULL); - pixbuf = gdk_pixbuf_loader_get_pixbuf(loader); - width = gdk_pixbuf_get_width(pixbuf); - height = gdk_pixbuf_get_height(pixbuf); - format = gdk_pixbuf_loader_get_format(loader); - g_object_unref(G_OBJECT(loader)); -#endif + if (format == NULL) return NULL; @@ -2643,25 +2370,18 @@ prpl_info->icon_spec.max_width >= width && prpl_info->icon_spec.min_height <= height && prpl_info->icon_spec.max_height >= height))) /* The icon is the correct size */ -#endif { -#if GTK_CHECK_VERSION(2,2,0) g_strfreev(prpl_formats); g_strfreev(pixbuf_formats); -#endif + /* We don't need to scale the image. */ - contents = NULL; if (!g_file_get_contents(path, &contents, &length, NULL)) { g_free(contents); -#if GTK_CHECK_VERSION(2,2,0) && !GTK_CHECK_VERSION(2,4,0) - g_object_unref(G_OBJECT(pixbuf)); -#endif return NULL; } } -#if GTK_CHECK_VERSION(2,2,0) else { int i; @@ -2782,156 +2502,8 @@ if (len) *len = length; return contents; -#else - /* - * The chosen icon wasn't the right size, and we're using - * GTK+ 2.0 so we can't scale it. - */ - return NULL; -#endif } -#if !GTK_CHECK_VERSION(2,6,0) -static void -_gdk_file_scale_size_prepared_cb (GdkPixbufLoader *loader, - int width, - int height, - gpointer data) -{ - struct { - gint width; - gint height; - gboolean preserve_aspect_ratio; - } *info = data; - - g_return_if_fail (width > 0 && height > 0); - - if (info->preserve_aspect_ratio && - (info->width > 0 || info->height > 0)) { - if (info->width < 0) - { - width = width * (double)info->height/(double)height; - height = info->height; - } - else if (info->height < 0) - { - height = height * (double)info->width/(double)width; - width = info->width; - } - else if ((double)height * (double)info->width > - (double)width * (double)info->height) { - width = 0.5 + (double)width * (double)info->height / (double)height; - height = info->height; - } else { - height = 0.5 + (double)height * (double)info->width / (double)width; - width = info->width; - } - } else { - if (info->width > 0) - width = info->width; - if (info->height > 0) - height = info->height; - } - -#if GTK_CHECK_VERSION(2,2,0) /* 2.0 users are going to have very strangely sized things */ - gdk_pixbuf_loader_set_size (loader, width, height); -#else -#warning nosnilmot could not be bothered to fix this properly for you -#warning ... good luck ... your images may end up strange sizes -#endif -} - -GdkPixbuf * -gdk_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, - gboolean preserve_aspect_ratio, - GError **error) -{ - GdkPixbufLoader *loader; - GdkPixbuf *pixbuf; - guchar buffer [4096]; - int length; - FILE *f; - struct { - gint width; - gint height; - gboolean preserve_aspect_ratio; - } info; - GdkPixbufAnimation *animation; - GdkPixbufAnimationIter *iter; - gboolean has_frame; - - g_return_val_if_fail (filename != NULL, NULL); - g_return_val_if_fail (width > 0 || width == -1, NULL); - g_return_val_if_fail (height > 0 || height == -1, NULL); - - f = g_fopen (filename, "rb"); - if (!f) { - gint save_errno = errno; - gchar *display_name = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); - g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (save_errno), - _("Failed to open file '%s': %s"), - display_name ? display_name : "(unknown)", - g_strerror (save_errno)); - g_free (display_name); - return NULL; - } - - loader = gdk_pixbuf_loader_new (); - - info.width = width; - info.height = height; - info.preserve_aspect_ratio = preserve_aspect_ratio; - - g_signal_connect (loader, "size-prepared", G_CALLBACK (_gdk_file_scale_size_prepared_cb), &info); - - has_frame = FALSE; - while (!has_frame && !feof (f) && !ferror (f)) { - length = fread (buffer, 1, sizeof (buffer), f); - if (length > 0) - if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) { - gdk_pixbuf_loader_close (loader, NULL); - fclose (f); - g_object_unref (loader); - return NULL; - } - - animation = gdk_pixbuf_loader_get_animation (loader); - if (animation) { - iter = gdk_pixbuf_animation_get_iter (animation, 0); - if (!gdk_pixbuf_animation_iter_on_currently_loading_frame (iter)) { - has_frame = TRUE; - } - g_object_unref (iter); - } - } - - fclose (f); - - if (!gdk_pixbuf_loader_close (loader, error) && !has_frame) { - g_object_unref (loader); - return NULL; - } - - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - - if (!pixbuf) { - gchar *display_name = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); - g_object_unref (loader); - g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, - _("Failed to load image '%s': reason not known, probably a corrupt image file"), - display_name ? display_name : "(unknown)"); - g_free (display_name); - return NULL; - } - - g_object_ref (pixbuf); - - g_object_unref (loader); - - return pixbuf; -} -#endif /* ! Gtk 2.6.0 */ - void pidgin_set_custom_buddy_icon(PurpleAccount *account, const char *who, const char *filename) { PurpleBuddy *buddy; @@ -2964,34 +2536,10 @@ void pidgin_set_urgent(GtkWindow *window, gboolean urgent) { -#if GTK_CHECK_VERSION(2,8,0) - gtk_window_set_urgency_hint(window, urgent); -#elif defined _WIN32 +#if defined _WIN32 winpidgin_window_flash(window, urgent); -#elif defined GDK_WINDOWING_X11 - GdkWindow *gdkwin; - XWMHints *hints; - - g_return_if_fail(window != NULL); - - gdkwin = GTK_WIDGET(window)->window; - - g_return_if_fail(gdkwin != NULL); - - hints = XGetWMHints(GDK_WINDOW_XDISPLAY(gdkwin), - GDK_WINDOW_XWINDOW(gdkwin)); - if(!hints) - hints = XAllocWMHints(); - - if (urgent) - hints->flags |= XUrgencyHint; - else - hints->flags &= ~XUrgencyHint; - XSetWMHints(GDK_WINDOW_XDISPLAY(gdkwin), - GDK_WINDOW_XWINDOW(gdkwin), hints); - XFree(hints); #else - /* do something else? */ + gtk_window_set_urgency_hint(window, urgent); #endif } @@ -3300,31 +2848,6 @@ return dim_grey_string; } -#if !GTK_CHECK_VERSION(2,2,0) -GtkTreePath * -gtk_tree_path_new_from_indices (gint first_index, ...) -{ - int arg; - va_list args; - GtkTreePath *path; - - path = gtk_tree_path_new (); - - va_start (args, first_index); - arg = first_index; - - while (arg != -1) - { - gtk_tree_path_append_index (path, arg); - arg = va_arg (args, gint); - } - - va_end (args); - - return path; -} -#endif - static void combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry) { @@ -3470,7 +2993,6 @@ return FALSE; #endif #else -#if GTK_CHECK_VERSION(2,4,0) /* This finds the currently active window and makes that the parent window. */ GList *windows = NULL; GtkWidget *parent = NULL; @@ -3513,7 +3035,6 @@ gtk_window_set_transient_for(GTK_WINDOW(widget), GTK_WINDOW(parent)); return TRUE; } -#endif return FALSE; #endif } @@ -3597,23 +3118,13 @@ #ifdef _WIN32 /* If using Win32... */ int code; - if (G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_filename = g_utf8_to_utf16( - uri, -1, NULL, NULL, NULL); - - code = (int)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, - SW_SHOW); - - g_free(wc_filename); - } else { - char *l_filename = g_locale_from_utf8( - uri, -1, NULL, NULL, NULL); - - code = (int)ShellExecuteA(NULL, NULL, l_filename, NULL, NULL, - SW_SHOW); - - g_free(l_filename); - } + wchar_t *wc_filename = g_utf8_to_utf16( + uri, -1, NULL, NULL, NULL); + + code = (int)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL, + SW_SHOW); + + g_free(wc_filename); if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC) { @@ -3710,13 +3221,10 @@ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); /* Open Containing Directory */ -#if GTK_CHECK_VERSION(2,6,0) img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU); item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img); -#else - item = gtk_menu_item_new_with_mnemonic(_("Open _Containing Directory")); -#endif + g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); @@ -3782,13 +3290,10 @@ url = gtk_imhtml_link_get_url(link); /* Play Sound */ -#if GTK_CHECK_VERSION(2,6,0) img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU); item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img); -#else - item = gtk_menu_item_new_with_mnemonic(_("_Play Sound")); -#endif + g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
--- a/pidgin/gtkutils.h Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkutils.h Sat Oct 03 21:31:14 2009 +0000 @@ -648,17 +648,6 @@ */ gpointer pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len); -#if !GTK_CHECK_VERSION(2,6,0) -/** - * Creates a new pixbuf by loading an image from a file. The image will - * be scaled to fit in the requested size, optionally preserving the image's - * aspect ratio. - */ -GdkPixbuf *gdk_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, - gboolean preserve_aspect_ratio, - GError **error); -#endif - #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKUTILS_C_) /** * Set or unset a custom buddyicon for a user. @@ -760,20 +749,6 @@ */ const char *pidgin_get_dim_grey_string(GtkWidget *widget); -#if !GTK_CHECK_VERSION(2,2,0) -/** - * This is copied from Gtk to support Gtk 2.0 - * - * Creates a new path with @a first_index and the varargs as indices. - * - * @param first_index first integer - * @param ... list of integers terminated by -1 - * - * @return A newly created GtkTreePath. - */ -GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, ...); -#endif - /** * Create a simple text GtkComboBoxEntry equivalent *
--- a/pidgin/gtkwhiteboard.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/gtkwhiteboard.c Sat Oct 03 21:31:14 2009 +0000 @@ -757,7 +757,6 @@ int result; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ dialog = gtk_file_chooser_dialog_new (_("Save File"), GTK_WINDOW(gtkwb->window), GTK_FILE_CHOOSER_ACTION_SAVE, @@ -776,21 +775,15 @@ else gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document); */ -#else - dialog = gtk_file_selection_new(_("Save File")); - gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog), "whiteboard.jpg"); -#endif + result = gtk_dialog_run(GTK_DIALOG(dialog)); if(result == GTK_RESPONSE_ACCEPT) { char *filename; -#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); -#else - filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog))); -#endif + gtk_widget_destroy(dialog); /* Makes an icon from the whiteboard's canvas 'image' */
--- a/pidgin/minidialog.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/minidialog.c Sat Oct 03 21:31:14 2009 +0000 @@ -339,26 +339,20 @@ param_spec = g_param_spec_string("title", "title", "String specifying the mini-dialog's title", NULL, -#if GTK_CHECK_VERSION(2,8,0) G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | -#endif G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_TITLE, param_spec); param_spec = g_param_spec_string("description", "description", "Description text for the mini-dialog, if desired", NULL, -#if GTK_CHECK_VERSION(2,8,0) G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | -#endif G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_DESCRIPTION, param_spec); param_spec = g_param_spec_string("icon-name", "icon-name", "String specifying the Gtk stock name of the dialog's icon", NULL, -#if GTK_CHECK_VERSION(2,8,0) G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | -#endif G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_ICON_NAME, param_spec); }
--- a/pidgin/pidgin.h Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/pidgin.h Sat Oct 03 21:31:14 2009 +0000 @@ -57,33 +57,6 @@ #endif /* - * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x) - * It defines the new wrap behavior (unknown in earlier versions) - * as the old (slightly buggy) wrap behavior. - * It also includes our back-ported GtkExpander - */ -/** @cond */ -#if (!GTK_CHECK_VERSION(2,4,0)) -# define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD -# include "gtkexpander.h" -#endif -/** @endcond */ - -/* - * We include the sources for GtkComboBox and GtkCellView because - * they don't exist in older versions of GTK+, and we use them - * in a few places. - */ -#if !GTK_CHECK_VERSION(2,6,0) -# include "gtkcellview.h" -# include "gtkcellviewmenuitem.h" -# include "pidgincombobox.h" -# if !GTK_CHECK_VERSION(2,4,0) -# include "gtkcelllayout.h" -# endif /* Less than GTK+ 2.4 */ -#endif /* Less than GTK+ 2.6 */ - -/* * Spacings between components, as defined by the * GNOME Human Interface Guidelines. */
--- a/pidgin/pidgincombobox.c Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3749 +0,0 @@ -/* pidgincombobox.c - * Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -/* -#include <config.h> -*/ -#include <gtk/gtkversion.h> -#if !GTK_CHECK_VERSION(2,6,0) -#include "pidgincombobox.h" - -#if !GTK_CHECK_VERSION(2,4,0) -#include <gtk/gtkarrow.h> -#include <gtk/gtkbindings.h> -#include "gtkcelllayout.h" -#include <gtk/gtkcellrenderertext.h> -#include "gtkcellview.h" -#include "gtkcellviewmenuitem.h" -#include <gtk/gtkeventbox.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktreeselection.h> -/* -#include <gtk/gtktreeprivate.h> -*/ -#include <gtk/gtkvseparator.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkversion.h> - -#include <gdk/gdkkeysyms.h> - -#include <gobject/gvaluecollector.h> - -#include <string.h> -#include <stdarg.h> - -#define P_(x) (x) - -/* WELCOME, to THE house of evil code */ - -typedef struct _ComboCellInfo ComboCellInfo; -struct _ComboCellInfo -{ - GtkCellRenderer *cell; - GSList *attributes; - - GtkCellLayoutDataFunc func; - gpointer func_data; - GDestroyNotify destroy; - - guint expand : 1; - guint pack : 1; -}; - -struct _GtkComboBoxPrivate -{ - GtkTreeModel *model; - - gint col_column; - gint row_column; - - gint wrap_width; - - gint active_item; - - GtkWidget *tree_view; - GtkTreeViewColumn *column; - - GtkWidget *cell_view; - GtkWidget *cell_view_frame; - - GtkWidget *button; - GtkWidget *box; - GtkWidget *arrow; - GtkWidget *separator; - - GtkWidget *popup_widget; - GtkWidget *popup_window; - GtkWidget *popup_frame; - - guint inserted_id; - guint deleted_id; - guint reordered_id; - guint changed_id; - - gint width; - GSList *cells; - - guint popup_in_progress : 1; - guint destroying : 1; -}; - -/* While debugging this evil code, I have learned that - * there are actually 4 modes to this widget, which can - * be characterized as follows - * - * 1) menu mode, no child added - * - * tree_view -> NULL - * cell_view -> GtkCellView, regular child - * cell_view_frame -> NULL - * button -> GtkToggleButton set_parent to combo - * box -> child of button - * arrow -> child of box - * separator -> child of box - * popup_widget -> GtkMenu - * popup_window -> NULL - * popup_frame -> NULL - * - * 2) menu mode, child added - * - * tree_view -> NULL - * cell_view -> NULL - * cell_view_frame -> NULL - * button -> GtkToggleButton set_parent to combo - * box -> NULL - * arrow -> GtkArrow, child of button - * separator -> NULL - * popup_widget -> GtkMenu - * popup_window -> NULL - * popup_frame -> NULL - * - * 3) list mode, no child added - * - * tree_view -> GtkTreeView, child of popup_frame - * cell_view -> GtkCellView, regular child - * cell_view_frame -> GtkFrame, set parent to combo - * button -> GtkToggleButton, set_parent to combo - * box -> NULL - * arrow -> GtkArrow, child of button - * separator -> NULL - * popup_widget -> tree_view - * popup_window -> GtkWindow - * popup_frame -> GtkFrame, child of popup_window - * - * 4) list mode, child added - * - * tree_view -> GtkTreeView, child of popup_frame - * cell_view -> NULL - * cell_view_frame -> NULL - * button -> GtkToggleButton, set_parent to combo - * box -> NULL - * arrow -> GtkArrow, child of button - * separator -> NULL - * popup_widget -> tree_view - * popup_window -> GtkWindow - * popup_frame -> GtkFrame, child of popup_window - * - */ - -enum { - CHANGED, - LAST_SIGNAL -}; - -enum { - PROP_0, - PROP_MODEL, - PROP_WRAP_WIDTH, - PROP_ROW_SPAN_COLUMN, - PROP_COLUMN_SPAN_COLUMN, - PROP_ACTIVE -}; - -static GtkBinClass *parent_class = NULL; -static guint combo_box_signals[LAST_SIGNAL] = {0,}; - -#define BONUS_PADDING 4 - - -/* common */ -static void gtk_combo_box_class_init (GtkComboBoxClass *klass); -static void gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface); -static void gtk_combo_box_init (GtkComboBox *combo_box); -static void gtk_combo_box_finalize (GObject *object); -static void gtk_combo_box_destroy (GtkObject *object); - -static void gtk_combo_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *spec); -static void gtk_combo_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *spec); - -static void gtk_combo_box_state_changed (GtkWidget *widget, - GtkStateType previous); -static void gtk_combo_box_style_set (GtkWidget *widget, - GtkStyle *previous); -static void gtk_combo_box_button_toggled (GtkWidget *widget, - gpointer data); -static void gtk_combo_box_add (GtkContainer *container, - GtkWidget *widget); -static void gtk_combo_box_remove (GtkContainer *container, - GtkWidget *widget); - -static ComboCellInfo *gtk_combo_box_get_cell_info (GtkComboBox *combo_box, - GtkCellRenderer *cell); - -static void gtk_combo_box_menu_show (GtkWidget *menu, - gpointer user_data); -static void gtk_combo_box_menu_hide (GtkWidget *menu, - gpointer user_data); - -static void gtk_combo_box_set_popup_widget (GtkComboBox *combo_box, - GtkWidget *popup); -#if GTK_CHECK_VERSION(2,2,0) -static void gtk_combo_box_menu_position_below (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data); -static void gtk_combo_box_menu_position_over (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data); -static void gtk_combo_box_menu_position (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data); -#endif - -static gint gtk_combo_box_calc_requested_width (GtkComboBox *combo_box, - GtkTreePath *path); -static void gtk_combo_box_remeasure (GtkComboBox *combo_box); - -static void gtk_combo_box_unset_model (GtkComboBox *combo_box); - -static void gtk_combo_box_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_combo_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gtk_combo_box_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); -static gboolean gtk_combo_box_expose_event (GtkWidget *widget, - GdkEventExpose *event); -static gboolean gtk_combo_box_scroll_event (GtkWidget *widget, - GdkEventScroll *event); -static void gtk_combo_box_set_active_internal (GtkComboBox *combo_box, - gint index); -static gboolean gtk_combo_box_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data); - -/* listening to the model */ -static void gtk_combo_box_model_row_inserted (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data); -static void gtk_combo_box_model_row_deleted (GtkTreeModel *model, - GtkTreePath *path, - gpointer user_data); -static void gtk_combo_box_model_rows_reordered (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gint *new_order, - gpointer user_data); -static void gtk_combo_box_model_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data); - -/* list */ -static void gtk_combo_box_list_position (GtkComboBox *combo_box, - gint *x, - gint *y, - gint *width, - gint *height); - -static void gtk_combo_box_list_setup (GtkComboBox *combo_box); -static void gtk_combo_box_list_destroy (GtkComboBox *combo_box); - -static void gtk_combo_box_list_remove_grabs (GtkComboBox *combo_box); - -static gboolean gtk_combo_box_list_button_released (GtkWidget *widget, - GdkEventButton *event, - gpointer data); -static gboolean gtk_combo_box_list_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data); -static gboolean gtk_combo_box_list_button_pressed (GtkWidget *widget, - GdkEventButton *event, - gpointer data); - -static void gtk_combo_box_list_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data); - -/* menu */ -static void gtk_combo_box_menu_setup (GtkComboBox *combo_box, - gboolean add_children); -static void gtk_combo_box_menu_fill (GtkComboBox *combo_box); -static void gtk_combo_box_menu_destroy (GtkComboBox *combo_box); - -static void gtk_combo_box_item_get_size (GtkComboBox *combo_box, - gint index, - gint *cols, - gint *rows); -static void gtk_combo_box_relayout_item (GtkComboBox *combo_box, - gint index); -static void gtk_combo_box_relayout (GtkComboBox *combo_box); - -static gboolean gtk_combo_box_menu_button_press (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); -static void gtk_combo_box_menu_item_activate (GtkWidget *item, - gpointer user_data); -static void gtk_combo_box_menu_row_inserted (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data); -static void gtk_combo_box_menu_row_deleted (GtkTreeModel *model, - GtkTreePath *path, - gpointer user_data); -static void gtk_combo_box_menu_rows_reordered (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gint *new_order, - gpointer user_data); -static void gtk_combo_box_menu_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data); -static gboolean gtk_combo_box_menu_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data); - -/* cell layout */ -static void gtk_combo_box_cell_layout_pack_start (GtkCellLayout *layout, - GtkCellRenderer *cell, - gboolean expand); -static void gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout, - GtkCellRenderer *cell, - gboolean expand); -static void gtk_combo_box_cell_layout_clear (GtkCellLayout *layout); -static void gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout, - GtkCellRenderer *cell, - const gchar *attribute, - gint column); -static void gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout *layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy); -static void gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout, - GtkCellRenderer *cell); -static void gtk_combo_box_cell_layout_reorder (GtkCellLayout *layout, - GtkCellRenderer *cell, - gint position); -static gboolean gtk_combo_box_mnemonic_activate (GtkWidget *widget, - gboolean group_cycling); - -static void cell_view_sync_cells (GtkComboBox *combo_box, - GtkCellView *cell_view); - -#if !GTK_CHECK_VERSION(2,4,0) -static void gtk_menu_attach (GtkMenu *menu, - GtkWidget *child, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach); -#endif - -GType -gtk_combo_box_get_type (void) -{ - static GType combo_box_type = 0; - - if (!combo_box_type) - { - static const GTypeInfo combo_box_info = - { - sizeof (GtkComboBoxClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_combo_box_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkComboBox), - 0, - (GInstanceInitFunc) gtk_combo_box_init - }; - - static const GInterfaceInfo cell_layout_info = - { - (GInterfaceInitFunc) gtk_combo_box_cell_layout_init, - NULL, - NULL - }; - - combo_box_type = g_type_register_static (GTK_TYPE_BIN, - "PidginComboBox", - &combo_box_info, - 0); - - g_type_add_interface_static (combo_box_type, - GTK_TYPE_CELL_LAYOUT, - &cell_layout_info); - } - - return combo_box_type; -} - -/* common */ -static void -gtk_combo_box_class_init (GtkComboBoxClass *klass) -{ - GObjectClass *object_class; - GtkBindingSet *binding_set; - GtkObjectClass *gtk_object_class; - GtkContainerClass *container_class; - GtkWidgetClass *widget_class; - - binding_set = gtk_binding_set_by_class (klass); - - container_class = (GtkContainerClass *)klass; - container_class->forall = gtk_combo_box_forall; - container_class->add = gtk_combo_box_add; - container_class->remove = gtk_combo_box_remove; - - widget_class = (GtkWidgetClass *)klass; - widget_class->size_allocate = gtk_combo_box_size_allocate; - widget_class->size_request = gtk_combo_box_size_request; - widget_class->expose_event = gtk_combo_box_expose_event; - widget_class->scroll_event = gtk_combo_box_scroll_event; - widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate; - widget_class->style_set = gtk_combo_box_style_set; - widget_class->state_changed = gtk_combo_box_state_changed; - - gtk_object_class = (GtkObjectClass *)klass; - gtk_object_class->destroy = gtk_combo_box_destroy; - - object_class = (GObjectClass *)klass; - object_class->finalize = gtk_combo_box_finalize; - object_class->set_property = gtk_combo_box_set_property; - object_class->get_property = gtk_combo_box_get_property; - - parent_class = g_type_class_peek_parent (klass); - - /* signals */ - combo_box_signals[CHANGED] = - g_signal_new ("changed", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkComboBoxClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - /* properties */ - g_object_class_install_property (object_class, - PROP_MODEL, - g_param_spec_object ("model", - P_("ComboBox model"), - P_("The model for the combo box"), - GTK_TYPE_TREE_MODEL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_WRAP_WIDTH, - g_param_spec_int ("wrap_width", - P_("Wrap width"), - P_("Wrap width for layouting the items in a grid"), - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_ROW_SPAN_COLUMN, - g_param_spec_int ("row_span_column", - P_("Row span column"), - P_("TreeModel column containing the row span values"), - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_COLUMN_SPAN_COLUMN, - g_param_spec_int ("column_span_column", - P_("Column span column"), - - P_("TreeModel column containing the column span values"), - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_ACTIVE, - g_param_spec_int ("active", - P_("Active item"), - P_("The item which is currently active"), - -1, - G_MAXINT, - -1, - G_PARAM_READWRITE)); - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boolean ("appears-as-list", - P_("Appears as list"), - P_("Whether combobox dropdowns should look like lists rather than menus"), - FALSE, - G_PARAM_READABLE)); -} - -static void -gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface) -{ - iface->pack_start = gtk_combo_box_cell_layout_pack_start; - iface->pack_end = gtk_combo_box_cell_layout_pack_end; - iface->clear = gtk_combo_box_cell_layout_clear; - iface->add_attribute = gtk_combo_box_cell_layout_add_attribute; - iface->set_cell_data_func = gtk_combo_box_cell_layout_set_cell_data_func; - iface->clear_attributes = gtk_combo_box_cell_layout_clear_attributes; - iface->reorder = gtk_combo_box_cell_layout_reorder; -} - -static void -gtk_combo_box_init (GtkComboBox *combo_box) -{ - combo_box->priv = g_new0(GtkComboBoxPrivate,1); - - combo_box->priv->cell_view = gtk_cell_view_new (); - gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (combo_box)); - GTK_BIN (combo_box)->child = combo_box->priv->cell_view; - gtk_widget_show (combo_box->priv->cell_view); - - combo_box->priv->width = 0; - combo_box->priv->wrap_width = 0; - - combo_box->priv->active_item = -1; - combo_box->priv->col_column = -1; - combo_box->priv->row_column = -1; -} - -static void -gtk_combo_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (object); - - switch (prop_id) - { - case PROP_MODEL: - gtk_combo_box_set_model (combo_box, g_value_get_object (value)); - break; - - case PROP_WRAP_WIDTH: - gtk_combo_box_set_wrap_width (combo_box, g_value_get_int (value)); - break; - - case PROP_ROW_SPAN_COLUMN: - gtk_combo_box_set_row_span_column (combo_box, g_value_get_int (value)); - break; - - case PROP_COLUMN_SPAN_COLUMN: - gtk_combo_box_set_column_span_column (combo_box, g_value_get_int (value)); - break; - - case PROP_ACTIVE: - gtk_combo_box_set_active (combo_box, g_value_get_int (value)); - break; - - default: - break; - } -} - -static void -gtk_combo_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (object); - - switch (prop_id) - { - case PROP_MODEL: - g_value_set_object (value, combo_box->priv->model); - break; - - case PROP_WRAP_WIDTH: - g_value_set_int (value, combo_box->priv->wrap_width); - break; - - case PROP_ROW_SPAN_COLUMN: - g_value_set_int (value, combo_box->priv->row_column); - break; - - case PROP_COLUMN_SPAN_COLUMN: - g_value_set_int (value, combo_box->priv->col_column); - break; - - case PROP_ACTIVE: - g_value_set_int (value, gtk_combo_box_get_active (combo_box)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_combo_box_state_changed (GtkWidget *widget, - GtkStateType previous) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - - if (GTK_WIDGET_REALIZED (widget)) - { - if (combo_box->priv->tree_view && combo_box->priv->cell_view) - gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view), - &widget->style->base[GTK_WIDGET_STATE (widget)]); - } - - gtk_widget_queue_draw (widget); -} - -static void -gtk_combo_box_check_appearance (GtkComboBox *combo_box) -{ - gboolean appears_as_list; - - /* if wrap_width > 0, then we are in grid-mode and forced to use - * unix style - */ - if (combo_box->priv->wrap_width) - appears_as_list = FALSE; - else - gtk_widget_style_get (GTK_WIDGET (combo_box), - "appears-as-list", &appears_as_list, - NULL); - - if (appears_as_list) - { - /* Destroy all the menu mode widgets, if they exist. */ - if (GTK_IS_MENU (combo_box->priv->popup_widget)) - gtk_combo_box_menu_destroy (combo_box); - - /* Create the list mode widgets, if they don't already exist. */ - if (!GTK_IS_TREE_VIEW (combo_box->priv->tree_view)) - gtk_combo_box_list_setup (combo_box); - } - else - { - /* Destroy all the list mode widgets, if they exist. */ - if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view)) - gtk_combo_box_list_destroy (combo_box); - - /* Create the menu mode widgets, if they don't already exist. */ - if (!GTK_IS_MENU (combo_box->priv->popup_widget)) - gtk_combo_box_menu_setup (combo_box, TRUE); - } -} - -static void -gtk_combo_box_style_set (GtkWidget *widget, - GtkStyle *previous) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - - gtk_combo_box_check_appearance (combo_box); - - if (combo_box->priv->tree_view && combo_box->priv->cell_view) - gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view), - &widget->style->base[GTK_WIDGET_STATE (widget)]); -} - -static void -gtk_combo_box_button_toggled (GtkWidget *widget, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - { - if (!combo_box->priv->popup_in_progress) - gtk_combo_box_popup (combo_box); - } - else - gtk_combo_box_popdown (combo_box); -} - -static void -gtk_combo_box_add (GtkContainer *container, - GtkWidget *widget) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (container); - - if (combo_box->priv->cell_view && combo_box->priv->cell_view->parent) - { - gtk_widget_unparent (combo_box->priv->cell_view); - GTK_BIN (container)->child = NULL; - gtk_widget_queue_resize (GTK_WIDGET (container)); - } - - gtk_widget_set_parent (widget, GTK_WIDGET (container)); - GTK_BIN (container)->child = widget; - - if (combo_box->priv->cell_view && - widget != combo_box->priv->cell_view) - { - /* since the cell_view was unparented, it's gone now */ - combo_box->priv->cell_view = NULL; - - if (!combo_box->priv->tree_view && combo_box->priv->separator) - { - gtk_container_remove (GTK_CONTAINER (combo_box->priv->separator->parent), - combo_box->priv->separator); - combo_box->priv->separator = NULL; - - gtk_widget_queue_resize (GTK_WIDGET (container)); - } - else if (combo_box->priv->cell_view_frame) - { - gtk_widget_unparent (combo_box->priv->cell_view_frame); - combo_box->priv->cell_view_frame = NULL; - } - } -} - -static void -gtk_combo_box_remove (GtkContainer *container, - GtkWidget *widget) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (container); - gboolean appears_as_list; - - gtk_widget_unparent (widget); - GTK_BIN (container)->child = NULL; - - if (combo_box->priv->destroying) - return; - - gtk_widget_queue_resize (GTK_WIDGET (container)); - - if (!combo_box->priv->tree_view) - appears_as_list = FALSE; - else - appears_as_list = TRUE; - - if (appears_as_list) - gtk_combo_box_list_destroy (combo_box); - else if (GTK_IS_MENU (combo_box->priv->popup_widget)) - { - gtk_combo_box_menu_destroy (combo_box); - gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget)); - combo_box->priv->popup_widget = NULL; - } - - if (!combo_box->priv->cell_view) - { - combo_box->priv->cell_view = gtk_cell_view_new (); - gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (container)); - GTK_BIN (container)->child = combo_box->priv->cell_view; - - gtk_widget_show (combo_box->priv->cell_view); - gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view), - combo_box->priv->model); - cell_view_sync_cells (combo_box, GTK_CELL_VIEW (combo_box->priv->cell_view)); - } - - - if (appears_as_list) - gtk_combo_box_list_setup (combo_box); - else - gtk_combo_box_menu_setup (combo_box, TRUE); - - gtk_combo_box_set_active_internal (combo_box, combo_box->priv->active_item); -} - -static ComboCellInfo * -gtk_combo_box_get_cell_info (GtkComboBox *combo_box, - GtkCellRenderer *cell) -{ - GSList *i; - - for (i = combo_box->priv->cells; i; i = i->next) - { - ComboCellInfo *info = (ComboCellInfo *)i->data; - - if (info && info->cell == cell) - return info; - } - - return NULL; -} - -static void -gtk_combo_box_menu_show (GtkWidget *menu, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button), - TRUE); - combo_box->priv->popup_in_progress = FALSE; -} - -static void -gtk_combo_box_menu_hide (GtkWidget *menu, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button), - FALSE); -} - -static void -gtk_combo_box_detacher (GtkWidget *widget, - GtkMenu *menu) -{ - GtkComboBox *combo_box; - - g_return_if_fail (GTK_IS_COMBO_BOX (widget)); - - combo_box = GTK_COMBO_BOX (widget); - g_return_if_fail (combo_box->priv->popup_widget == (GtkWidget*) menu); - - g_signal_handlers_disconnect_by_func (menu, - gtk_combo_box_menu_show, - combo_box); - g_signal_handlers_disconnect_by_func (menu, - gtk_combo_box_menu_hide, - combo_box); - - combo_box->priv->popup_widget = NULL; -} - -static void -gtk_combo_box_set_popup_widget (GtkComboBox *combo_box, - GtkWidget *popup) -{ - if (GTK_IS_MENU (combo_box->priv->popup_widget)) - { - gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget)); - combo_box->priv->popup_widget = NULL; - } - else if (combo_box->priv->popup_widget) - { - gtk_container_remove (GTK_CONTAINER (combo_box->priv->popup_frame), - combo_box->priv->popup_widget); - g_object_unref (G_OBJECT (combo_box->priv->popup_widget)); - combo_box->priv->popup_widget = NULL; - } - - if (GTK_IS_MENU (popup)) - { - if (combo_box->priv->popup_window) - { - gtk_widget_destroy (combo_box->priv->popup_window); - combo_box->priv->popup_window = NULL; - combo_box->priv->popup_frame = NULL; - } - - combo_box->priv->popup_widget = popup; - - g_signal_connect (popup, "show", - G_CALLBACK (gtk_combo_box_menu_show), combo_box); - g_signal_connect (popup, "hide", - G_CALLBACK (gtk_combo_box_menu_hide), combo_box); - - gtk_menu_attach_to_widget (GTK_MENU (popup), - GTK_WIDGET (combo_box), - gtk_combo_box_detacher); - } - else - { - if (!combo_box->priv->popup_window) - { - combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_resizable (GTK_WINDOW (combo_box->priv->popup_window), FALSE); -#if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_screen (GTK_WINDOW (combo_box->priv->popup_window), - gtk_widget_get_screen (GTK_WIDGET (combo_box))); -#endif - - combo_box->priv->popup_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->popup_frame), - GTK_SHADOW_ETCHED_IN); - gtk_container_add (GTK_CONTAINER (combo_box->priv->popup_window), - combo_box->priv->popup_frame); - - gtk_widget_show (combo_box->priv->popup_frame); - } - - gtk_container_add (GTK_CONTAINER (combo_box->priv->popup_frame), - popup); - gtk_widget_show (popup); - g_object_ref (G_OBJECT (popup)); - combo_box->priv->popup_widget = popup; - } -} - -#if GTK_CHECK_VERSION(2,2,0) -static void -gtk_combo_box_menu_position_below (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint sx, sy; - GtkWidget *child; - GtkRequisition req; - GdkScreen *screen; - gint monitor_num; - GdkRectangle monitor; - - /* FIXME: is using the size request here broken? */ - child = GTK_BIN (combo_box)->child; - - gdk_window_get_origin (child->window, &sx, &sy); - - if (GTK_WIDGET_NO_WINDOW (child)) - { - sx += child->allocation.x; - sy += child->allocation.y; - } - - gtk_widget_size_request (GTK_WIDGET (menu), &req); - - if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_LTR) - *x = sx; - else - *x = sx + child->allocation.width - req.width; - *y = sy; - - screen = gtk_widget_get_screen (GTK_WIDGET (combo_box)); - monitor_num = gdk_screen_get_monitor_at_window (screen, - GTK_WIDGET (combo_box)->window); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (*x < monitor.x) - *x = monitor.x; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x + monitor.width - req.width; - - if (monitor.y + monitor.height - *y - child->allocation.height >= req.height) - *y += child->allocation.height; - else if (*y - monitor.y >= req.height) - *y -= req.height; - else if (monitor.y + monitor.height - *y - child->allocation.height > *y - monitor.y) - *y += child->allocation.height; - else - *y -= req.height; - - *push_in = FALSE; -} - -static void -gtk_combo_box_menu_position_over (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data) -{ - GtkComboBox *combo_box; - GtkWidget *active; - GtkWidget *child; - GtkWidget *widget; - GtkRequisition requisition; - GList *children; - gint screen_width; - gint menu_xpos; - gint menu_ypos; - gint menu_width; - - g_return_if_fail (GTK_IS_COMBO_BOX (user_data)); - - combo_box = GTK_COMBO_BOX (user_data); - widget = GTK_WIDGET (combo_box); - - gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition); - menu_width = requisition.width; - - active = gtk_menu_get_active (GTK_MENU (combo_box->priv->popup_widget)); - gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos); - - menu_xpos += widget->allocation.x; - menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2; - - if (active != NULL) - { - gtk_widget_get_child_requisition (active, &requisition); - menu_ypos -= requisition.height / 2; - } - - children = GTK_MENU_SHELL (combo_box->priv->popup_widget)->children; - while (children) - { - child = children->data; - - if (active == child) - break; - - if (GTK_WIDGET_VISIBLE (child)) - { - gtk_widget_get_child_requisition (child, &requisition); - menu_ypos -= requisition.height; - } - - children = children->next; - } - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - menu_xpos = menu_xpos + widget->allocation.width - menu_width; - - /* Clamp the position on screen */ - screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget)); - - if (menu_xpos < 0) - menu_xpos = 0; - else if ((menu_xpos + menu_width) > screen_width) - menu_xpos -= ((menu_xpos + menu_width) - screen_width); - - *x = menu_xpos; - *y = menu_ypos; - - *push_in = TRUE; -} - -static void -gtk_combo_box_menu_position (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data) -{ - GtkComboBox *combo_box; - GtkWidget *menu_item; - - combo_box = GTK_COMBO_BOX (user_data); - - if (combo_box->priv->wrap_width > 0 || combo_box->priv->cell_view == NULL) - gtk_combo_box_menu_position_below (menu, x, y, push_in, user_data); - else - { - menu_item = gtk_menu_get_active (GTK_MENU (combo_box->priv->popup_widget)); - if (menu_item) - gtk_menu_shell_select_item (GTK_MENU_SHELL (combo_box->priv->popup_widget), - menu_item); - - gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data); - } - -} -#endif /* Gtk 2.2 */ - -static void -gtk_combo_box_list_position (GtkComboBox *combo_box, - gint *x, - gint *y, - gint *width, - gint *height) -{ - GtkWidget *sample; - GtkRequisition popup_req; -#if GTK_CHECK_VERSION(2,2,0) - GdkScreen *screen; - gint monitor_num; - GdkRectangle monitor; -#endif - - sample = GTK_BIN (combo_box)->child; - - *width = sample->allocation.width; - gtk_widget_size_request (combo_box->priv->popup_window, &popup_req); - *height = popup_req.height; - - gdk_window_get_origin (sample->window, x, y); - - if (combo_box->priv->cell_view_frame) - { - *x -= GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness; - *width += 2 * (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness); - } - - if (GTK_WIDGET_NO_WINDOW (sample)) - { - *x += sample->allocation.x; - *y += sample->allocation.y; - } - -#if GTK_CHECK_VERSION(2,2,0) - screen = gtk_widget_get_screen (GTK_WIDGET (combo_box)); - monitor_num = gdk_screen_get_monitor_at_window (screen, - GTK_WIDGET (combo_box)->window); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (*x < monitor.x) - *x = monitor.x; - else if (*x + *width > monitor.x + monitor.width) - *x = monitor.x + monitor.width - *width; - - if (*y + sample->allocation.height + *height <= monitor.y + monitor.height) - *y += sample->allocation.height; - else - *y -= *height; -#endif /* Gtk 2.2 */ -} - -/** - * gtk_combo_box_popup: - * @combo_box: a #GtkComboBox - * - * Pops up the menu or dropdown list of @combo_box. - * - * This function is mostly intended for use by accessibility technologies; - * applications should have little use for it. - * - * Since: 2.4 - **/ -void -gtk_combo_box_popup (GtkComboBox *combo_box) -{ - gint x, y, width, height; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - if (GTK_WIDGET_MAPPED (combo_box->priv->popup_widget)) - return; - - if (GTK_IS_MENU (combo_box->priv->popup_widget)) - { - gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget), - combo_box->priv->active_item); - - if (combo_box->priv->wrap_width == 0) - { - GtkRequisition requisition; - - width = GTK_WIDGET (combo_box)->allocation.width; - gtk_widget_size_request (combo_box->priv->popup_widget, &requisition); - - gtk_widget_set_size_request (combo_box->priv->popup_widget, - MAX (width, requisition.width), -1); - } - - gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget), - NULL, NULL, -#if GTK_CHECK_VERSION(2,2,0) - gtk_combo_box_menu_position, -#else - NULL, -#endif - combo_box, 0, 0); - return; - } - - gtk_widget_show_all (combo_box->priv->popup_frame); - gtk_combo_box_list_position (combo_box, &x, &y, &width, &height); - - gtk_widget_set_size_request (combo_box->priv->popup_window, width, -1); - gtk_window_move (GTK_WINDOW (combo_box->priv->popup_window), x, y); - - /* popup */ - gtk_widget_show (combo_box->priv->popup_window); - - gtk_widget_grab_focus (combo_box->priv->popup_window); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button), - TRUE); - - if (!GTK_WIDGET_HAS_FOCUS (combo_box->priv->tree_view)) - { - gdk_keyboard_grab (combo_box->priv->popup_window->window, - FALSE, GDK_CURRENT_TIME); - gtk_widget_grab_focus (combo_box->priv->tree_view); - } - - gtk_grab_add (combo_box->priv->popup_window); - gdk_pointer_grab (combo_box->priv->popup_window->window, TRUE, - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, NULL, GDK_CURRENT_TIME); - - gtk_grab_add (combo_box->priv->tree_view); -} - -/** - * gtk_combo_box_popdown: - * @combo_box: a #GtkComboBox - * - * Hides the menu or dropdown list of @combo_box. - * - * This function is mostly intended for use by accessibility technologies; - * applications should have little use for it. - * - * Since: 2.4 - **/ -void -gtk_combo_box_popdown (GtkComboBox *combo_box) -{ - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box))) - return; - - if (GTK_IS_MENU (combo_box->priv->popup_widget)) - { - gtk_menu_popdown (GTK_MENU (combo_box->priv->popup_widget)); - return; - } - - gtk_combo_box_list_remove_grabs (combo_box); - gtk_widget_hide_all (combo_box->priv->popup_window); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button), - FALSE); -} - -static gint -gtk_combo_box_calc_requested_width (GtkComboBox *combo_box, - GtkTreePath *path) -{ - gint padding; - GtkRequisition req; - - if (combo_box->priv->cell_view) - gtk_widget_style_get (combo_box->priv->cell_view, - "focus-line-width", &padding, - NULL); - else - padding = 0; - - /* add some pixels for good measure */ - padding += BONUS_PADDING; - - if (combo_box->priv->cell_view) - gtk_cell_view_get_size_of_row (GTK_CELL_VIEW (combo_box->priv->cell_view), - path, &req); - else - req.width = 0; - - return req.width + padding; -} - -static void -gtk_combo_box_remeasure (GtkComboBox *combo_box) -{ - GtkTreeIter iter; - GtkTreePath *path; - gint padding = 0; - - if (!combo_box->priv->model || - !gtk_tree_model_get_iter_first (combo_box->priv->model, &iter)) - return; - - combo_box->priv->width = 0; - -#if GTK_CHECK_VERSION(2,2,0) - path = gtk_tree_path_new_from_indices (0, -1); -#else - path = gtk_tree_path_new_first(); -#endif - - if (combo_box->priv->cell_view) - gtk_widget_style_get (combo_box->priv->cell_view, - "focus-line-width", &padding, - NULL); - else - padding = 0; - - /* add some pixels for good measure */ - padding += BONUS_PADDING; - - do - { - GtkRequisition req; - - if (combo_box->priv->cell_view) - gtk_cell_view_get_size_of_row (GTK_CELL_VIEW (combo_box->priv->cell_view), - path, &req); - else - req.width = 0; - - combo_box->priv->width = MAX (combo_box->priv->width, - req.width + padding); - - gtk_tree_path_next (path); - } - while (gtk_tree_model_iter_next (combo_box->priv->model, &iter)); - - gtk_tree_path_free (path); -} - -static void -gtk_combo_box_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - gint width, height; - GtkRequisition bin_req; - - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - - /* common */ - gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req); - gtk_combo_box_remeasure (combo_box); - bin_req.width = MAX (bin_req.width, combo_box->priv->width); - - gtk_combo_box_check_appearance (combo_box); - - if (!combo_box->priv->tree_view) - { - /* menu mode */ - - if (combo_box->priv->cell_view) - { - GtkRequisition button_req, sep_req, arrow_req; - gint border_width, xthickness, ythickness; - - gtk_widget_size_request (combo_box->priv->button, &button_req); - border_width = GTK_CONTAINER (combo_box->priv->button)->border_width; - xthickness = combo_box->priv->button->style->xthickness; - ythickness = combo_box->priv->button->style->ythickness; - - bin_req.width = MAX (bin_req.width, combo_box->priv->width); - - gtk_widget_size_request (combo_box->priv->separator, &sep_req); - gtk_widget_size_request (combo_box->priv->arrow, &arrow_req); - - height = MAX (sep_req.height, arrow_req.height); - height = MAX (height, bin_req.height); - - width = bin_req.width + sep_req.width + arrow_req.width; - - height += border_width + 1 + ythickness * 2 + 4; - width += border_width + 1 + xthickness * 2 + 4; - - requisition->width = width; - requisition->height = height; - } - else - { - GtkRequisition but_req; - - gtk_widget_size_request (combo_box->priv->button, &but_req); - - requisition->width = bin_req.width + but_req.width; - requisition->height = MAX (bin_req.height, but_req.height); - } - } - else - { - /* list mode */ - GtkRequisition button_req, frame_req; - - /* sample + frame */ - *requisition = bin_req; - - if (combo_box->priv->cell_view_frame) - { - gtk_widget_size_request (combo_box->priv->cell_view_frame, &frame_req); - requisition->width += 2 * - (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness); - requisition->height += 2 * - (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness); - } - - /* the button */ - gtk_widget_size_request (combo_box->priv->button, &button_req); - - requisition->height = MAX (requisition->height, button_req.height); - requisition->width += button_req.width; - } -} - -static void -gtk_combo_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - GtkAllocation child; - GtkRequisition req; - gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; - - widget->allocation = *allocation; - - gtk_combo_box_check_appearance (combo_box); - - if (!combo_box->priv->tree_view) - { - if (combo_box->priv->cell_view) - { - gint border_width, xthickness, ythickness; - gint width; - - /* menu mode */ - gtk_widget_size_allocate (combo_box->priv->button, allocation); - - /* set some things ready */ - border_width = GTK_CONTAINER (combo_box->priv->button)->border_width; - xthickness = combo_box->priv->button->style->xthickness; - ythickness = combo_box->priv->button->style->ythickness; - - child.x = allocation->x + border_width + 1 + xthickness + 2; - child.y = allocation->y + border_width + 1 + ythickness + 2; - - width = MAX(1, allocation->width - (border_width + 1 + xthickness * 2 + 4)); - - /* handle the children */ - gtk_widget_size_request (combo_box->priv->arrow, &req); - child.width = req.width; - child.height = MAX(1, allocation->height - 2 * (child.y - allocation->y)); - if (!is_rtl) - child.x += width - req.width; - gtk_widget_size_allocate (combo_box->priv->arrow, &child); - if (is_rtl) - child.x += req.width; - gtk_widget_size_request (combo_box->priv->separator, &req); - child.width = req.width; - if (!is_rtl) - child.x -= req.width; - gtk_widget_size_allocate (combo_box->priv->separator, &child); - - if (is_rtl) - { - child.x += req.width; - child.width = MAX(1, allocation->x + allocation->width - - (border_width + 1 + xthickness + 2) - child.x); - } - else - { - child.width = child.x; - child.x = allocation->x + border_width + 1 + xthickness + 2; - child.width = MAX(1, child.width - child.x); - } - - gtk_widget_size_allocate (GTK_BIN (widget)->child, &child); - } - else - { - gtk_widget_size_request (combo_box->priv->button, &req); - if (is_rtl) - child.x = allocation->x; - else - child.x = allocation->x + allocation->width - req.width; - child.y = allocation->y; - child.width = req.width; - child.height = allocation->height; - gtk_widget_size_allocate (combo_box->priv->button, &child); - - if (is_rtl) - child.x = allocation->x + req.width; - else - child.x = allocation->x; - child.y = allocation->y; - child.width = MAX(1, allocation->width - req.width); - gtk_widget_size_allocate (GTK_BIN (widget)->child, &child); - } - } - else - { - /* list mode */ - - /* button */ - gtk_widget_size_request (combo_box->priv->button, &req); - if (is_rtl) - child.x = allocation->x; - else - child.x = allocation->x + allocation->width - req.width; - child.y = allocation->y; - child.width = req.width; - child.height = allocation->height; - gtk_widget_size_allocate (combo_box->priv->button, &child); - - /* frame */ - if (is_rtl) - child.x = allocation->x + req.width; - else - child.x = allocation->x; - child.y = allocation->y; - child.width = MAX (1, allocation->width - req.width); - child.height = allocation->height; - - if (combo_box->priv->cell_view_frame) - { - gtk_widget_size_allocate (combo_box->priv->cell_view_frame, &child); - - /* the sample */ - child.x += - GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness; - child.y += - GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness; - child.width -= 2 * ( - GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness); - child.width = MAX(1,child.width); - child.height -= 2 * ( - GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width + - GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness); - child.height = MAX(1,child.height); - } - - gtk_widget_size_allocate (GTK_BIN (combo_box)->child, &child); - } -} - -static void -gtk_combo_box_unset_model (GtkComboBox *combo_box) -{ - if (combo_box->priv->model) - { - g_signal_handler_disconnect (combo_box->priv->model, - combo_box->priv->inserted_id); - g_signal_handler_disconnect (combo_box->priv->model, - combo_box->priv->deleted_id); - g_signal_handler_disconnect (combo_box->priv->model, - combo_box->priv->reordered_id); - g_signal_handler_disconnect (combo_box->priv->model, - combo_box->priv->changed_id); - } - - /* menu mode */ - if (!combo_box->priv->tree_view) - { - if (combo_box->priv->popup_widget) - gtk_container_foreach (GTK_CONTAINER (combo_box->priv->popup_widget), - (GtkCallback)gtk_widget_destroy, NULL); - } - - if (combo_box->priv->model) - { - g_object_unref (G_OBJECT (combo_box->priv->model)); - combo_box->priv->model = NULL; - } - - if (combo_box->priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL); -} - -static void -gtk_combo_box_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (container); - - if (include_internals) - { - if (combo_box->priv->button) - (* callback) (combo_box->priv->button, callback_data); - if (combo_box->priv->cell_view_frame) - (* callback) (combo_box->priv->cell_view_frame, callback_data); - } - - if (GTK_BIN (container)->child) - (* callback) (GTK_BIN (container)->child, callback_data); -} - -static gboolean -gtk_combo_box_expose_event (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - - if (!combo_box->priv->tree_view) - { - gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->button, event); - } - else - { - gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->button, event); - - if (combo_box->priv->cell_view_frame) - gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->cell_view_frame, event); - } - - gtk_container_propagate_expose (GTK_CONTAINER (widget), - GTK_BIN (widget)->child, event); - - return FALSE; -} - -static gboolean -gtk_combo_box_scroll_event (GtkWidget *widget, - GdkEventScroll *event) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - gint index; - gint items; - - index = gtk_combo_box_get_active (combo_box); - - if (index != -1) - { - items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL); - - if (event->direction == GDK_SCROLL_UP) - index--; - else - index++; - - gtk_combo_box_set_active (combo_box, CLAMP (index, 0, items - 1)); - } - - return TRUE; -} - -/* - * menu style - */ - -static void -cell_view_sync_cells (GtkComboBox *combo_box, - GtkCellView *cell_view) -{ - GSList *k; - - for (k = combo_box->priv->cells; k; k = k->next) - { - GSList *j; - ComboCellInfo *info = (ComboCellInfo *)k->data; - - if (info->pack == GTK_PACK_START) - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cell_view), - info->cell, info->expand); - else if (info->pack == GTK_PACK_END) - gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (cell_view), - info->cell, info->expand); - - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (cell_view), - info->cell, - info->func, info->func_data, NULL); - - for (j = info->attributes; j; j = j->next->next) - { - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cell_view), - info->cell, - j->data, - GPOINTER_TO_INT (j->next->data)); - } - } -} - -static void -gtk_combo_box_menu_setup (GtkComboBox *combo_box, - gboolean add_children) -{ - GtkWidget *menu; - - if (combo_box->priv->cell_view) - { - combo_box->priv->button = gtk_toggle_button_new (); - g_signal_connect (combo_box->priv->button, "toggled", - G_CALLBACK (gtk_combo_box_button_toggled), combo_box); - g_signal_connect_after (combo_box->priv->button, "key_press_event", - G_CALLBACK (gtk_combo_box_key_press), combo_box); - gtk_widget_set_parent (combo_box->priv->button, - GTK_BIN (combo_box)->child->parent); - - combo_box->priv->box = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (combo_box->priv->button), - combo_box->priv->box); - - combo_box->priv->separator = gtk_vseparator_new (); - gtk_container_add (GTK_CONTAINER (combo_box->priv->box), - combo_box->priv->separator); - - combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (combo_box->priv->box), - combo_box->priv->arrow); - - gtk_widget_show_all (combo_box->priv->button); - } - else - { - combo_box->priv->button = gtk_toggle_button_new (); - g_signal_connect (combo_box->priv->button, "toggled", - G_CALLBACK (gtk_combo_box_button_toggled), combo_box); - g_signal_connect_after (combo_box, "key_press_event", - G_CALLBACK (gtk_combo_box_key_press), combo_box); - gtk_widget_set_parent (combo_box->priv->button, - GTK_BIN (combo_box)->child->parent); - - combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (combo_box->priv->button), - combo_box->priv->arrow); - gtk_widget_show_all (combo_box->priv->button); - } - - g_signal_connect (combo_box->priv->button, "button_press_event", - G_CALLBACK (gtk_combo_box_menu_button_press), - combo_box); - - /* create our funky menu */ - menu = gtk_menu_new (); - g_signal_connect (menu, "key_press_event", - G_CALLBACK (gtk_combo_box_menu_key_press), combo_box); - gtk_combo_box_set_popup_widget (combo_box, menu); - - /* add items */ - if (add_children) - gtk_combo_box_menu_fill (combo_box); - -} - -static void -gtk_combo_box_menu_fill (GtkComboBox *combo_box) -{ - gint i, items; - GtkWidget *menu; - GtkWidget *tmp; - - if (!combo_box->priv->model) - return; - - items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL); - menu = combo_box->priv->popup_widget; - - for (i = 0; i < items; i++) - { - GtkTreePath *path; -#if GTK_CHECK_VERSION(2,2,0) - path = gtk_tree_path_new_from_indices (i, -1); -#else - char buf[32]; - g_snprintf(buf, sizeof(buf), "%d", i); - path = gtk_tree_path_new_from_string(buf); -#endif - tmp = gtk_cell_view_menu_item_new_from_model (combo_box->priv->model, - path); - g_signal_connect (tmp, "activate", - G_CALLBACK (gtk_combo_box_menu_item_activate), - combo_box); - - cell_view_sync_cells (combo_box, - GTK_CELL_VIEW (GTK_BIN (tmp)->child)); - - gtk_menu_shell_append (GTK_MENU_SHELL (menu), tmp); - - if (combo_box->priv->wrap_width) - gtk_combo_box_relayout_item (combo_box, i); - - gtk_widget_show (tmp); - - gtk_tree_path_free (path); - } -} - -static void -gtk_combo_box_menu_destroy (GtkComboBox *combo_box) -{ - g_signal_handlers_disconnect_matched (combo_box->priv->button, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - gtk_combo_box_menu_button_press, NULL); - - /* unparent will remove our latest ref */ - gtk_widget_unparent (combo_box->priv->button); - - combo_box->priv->box = NULL; - combo_box->priv->button = NULL; - combo_box->priv->arrow = NULL; - combo_box->priv->separator = NULL; - - /* changing the popup window will unref the menu and the children */ -} - -/* - * grid - */ - -static void -gtk_combo_box_item_get_size (GtkComboBox *combo_box, - gint index_, - gint *cols, - gint *rows) -{ - GtkTreeIter iter; - - gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter, NULL, index_); - - if (cols) - { - if (combo_box->priv->col_column == -1) - *cols = 1; - else - gtk_tree_model_get (combo_box->priv->model, &iter, - combo_box->priv->col_column, cols, - -1); - } - - if (rows) - { - if (combo_box->priv->row_column == -1) - *rows = 1; - else - gtk_tree_model_get (combo_box->priv->model, &iter, - combo_box->priv->row_column, rows, - -1); - } -} - -static gboolean -menu_occupied (GtkMenu *menu, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach) -{ - GList *i; - - g_return_val_if_fail (GTK_IS_MENU (menu), TRUE); - g_return_val_if_fail (left_attach < right_attach, TRUE); - g_return_val_if_fail (top_attach < bottom_attach, TRUE); - - for (i = GTK_MENU_SHELL (menu)->children; i; i = i->next) - { - guint l, r, b, t; - gboolean h_intersect = FALSE; - gboolean v_intersect = FALSE; - - gtk_container_child_get (GTK_CONTAINER (menu), i->data, - "left_attach", &l, - "right_attach", &r, - "bottom_attach", &b, - "top_attach", &t, - NULL); - - /* look if this item intersects with the given coordinates */ - h_intersect = left_attach <= l && l <= right_attach; - h_intersect &= left_attach <= r && r <= right_attach; - - v_intersect = top_attach <= t && t <= bottom_attach; - v_intersect &= top_attach <= b && b <= bottom_attach; - - if (h_intersect && v_intersect) - return TRUE; - } - - return FALSE; -} - -static void -gtk_combo_box_relayout_item (GtkComboBox *combo_box, - gint index) -{ - gint current_col = 0, current_row = 0; - gint rows, cols; - GList *list, *nth; - GtkWidget *item, *last; - GtkWidget *menu; - - menu = combo_box->priv->popup_widget; - if (!GTK_IS_MENU_SHELL (menu)) - return; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - nth = g_list_nth (list, index); - item = nth->data; - if (nth->prev) - last = nth->prev->data; - else - last = NULL; - g_list_free (list); - - gtk_combo_box_item_get_size (combo_box, index, &cols, &rows); - - if (combo_box->priv->col_column == -1 && - combo_box->priv->row_column == -1 && - last) - { - gtk_container_child_get (GTK_CONTAINER (menu), - last, - "right_attach", ¤t_col, - "top_attach", ¤t_row, - NULL); - if (current_col + cols > combo_box->priv->wrap_width) - { - current_col = 0; - current_row++; - } - } - else - { - /* look for a good spot */ - while (1) - { - if (current_col + cols > combo_box->priv->wrap_width) - { - current_col = 0; - current_row++; - } - - if (!menu_occupied (GTK_MENU (menu), - current_col, current_col + cols, - current_row, current_row + rows)) - break; - - current_col++; - } - } - - /* set attach props */ - gtk_menu_attach (GTK_MENU (menu), item, - current_col, current_col + cols, - current_row, current_row + rows); -} - -static void -gtk_combo_box_relayout (GtkComboBox *combo_box) -{ - GList *list, *j; - GtkWidget *menu; - - menu = combo_box->priv->popup_widget; - - /* do nothing unless we are in menu style and realized */ - if (combo_box->priv->tree_view || !GTK_IS_MENU_SHELL (menu)) - return; - - /* get rid of all children */ - list = gtk_container_get_children (GTK_CONTAINER (menu)); - - for (j = g_list_last (list); j; j = j->prev) - gtk_container_remove (GTK_CONTAINER (menu), j->data); - - g_list_free (list); - - /* and relayout */ - gtk_combo_box_menu_fill (combo_box); -} - -/* callbacks */ -static gboolean -gtk_combo_box_menu_button_press (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - if (! GTK_IS_MENU (combo_box->priv->popup_widget)) - return FALSE; - - if (event->type == GDK_BUTTON_PRESS && event->button == 1) - { - combo_box->priv->popup_in_progress = TRUE; - - gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget), - combo_box->priv->active_item); - - if (combo_box->priv->wrap_width == 0) - { - GtkRequisition requisition; - gint width; - - width = GTK_WIDGET (combo_box)->allocation.width; - gtk_widget_size_request (combo_box->priv->popup_widget, &requisition); - - gtk_widget_set_size_request (combo_box->priv->popup_widget, - MAX (width, requisition.width), -1); - } - - gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget), - NULL, NULL, -#if GTK_CHECK_VERSION(2,2,0) - gtk_combo_box_menu_position, -#else - NULL, -#endif - combo_box, event->button, event->time); - - return TRUE; - } - - return FALSE; -} - -static void -gtk_combo_box_menu_item_activate (GtkWidget *item, - gpointer user_data) -{ - gint index; - GtkWidget *menu; - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - menu = combo_box->priv->popup_widget; - g_return_if_fail (GTK_IS_MENU (menu)); - - index = g_list_index (GTK_MENU_SHELL (menu)->children, item); - - gtk_combo_box_set_active (combo_box, index); -} - -static void -gtk_combo_box_model_row_inserted (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint index = gtk_tree_path_get_indices (path)[0]; - - if (combo_box->priv->active_item >= index) - combo_box->priv->active_item++; - - if (!combo_box->priv->tree_view) - gtk_combo_box_menu_row_inserted (model, path, iter, user_data); -} - -static void -gtk_combo_box_model_row_deleted (GtkTreeModel *model, - GtkTreePath *path, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint index = gtk_tree_path_get_indices (path)[0]; - - if (!combo_box->priv->tree_view) - gtk_combo_box_menu_row_deleted (model, path, user_data); - - if (index == combo_box->priv->active_item) - { - gint items = gtk_tree_model_iter_n_children (model, NULL); - - if (items == 0) - gtk_combo_box_set_active_internal (combo_box, -1); - else if (index == items) - gtk_combo_box_set_active_internal (combo_box, index - 1); - else - gtk_combo_box_set_active_internal (combo_box, index); - } - else if (combo_box->priv->active_item > index) - combo_box->priv->active_item--; -} - -static void -gtk_combo_box_model_rows_reordered (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gint *new_order, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint items = gtk_tree_model_iter_n_children (model, NULL); - gint i; - - for (i = 0; i < items; i++) - if (new_order[i] == combo_box->priv->active_item) - { - combo_box->priv->active_item = i; - break; - } - - if (!combo_box->priv->tree_view) - gtk_combo_box_menu_rows_reordered (model, path, iter, new_order, user_data); -} - -static void -gtk_combo_box_model_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint index = gtk_tree_path_get_indices (path)[0]; - - if (index == combo_box->priv->active_item && - combo_box->priv->cell_view) - gtk_widget_queue_resize (GTK_WIDGET (combo_box->priv->cell_view)); - - if (combo_box->priv->tree_view) - gtk_combo_box_list_row_changed (model, path, iter, user_data); - else - gtk_combo_box_menu_row_changed (model, path, iter, user_data); -} - - -static void -gtk_combo_box_menu_row_inserted (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - GtkWidget *menu; - GtkWidget *item; - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - if (!combo_box->priv->popup_widget) - return; - - menu = combo_box->priv->popup_widget; - g_return_if_fail (GTK_IS_MENU (menu)); - - item = gtk_cell_view_menu_item_new_from_model (model, path); - g_signal_connect (item, "activate", - G_CALLBACK (gtk_combo_box_menu_item_activate), - combo_box); - - cell_view_sync_cells (combo_box, GTK_CELL_VIEW (GTK_BIN (item)->child)); - - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), item, - gtk_tree_path_get_indices (path)[0]); - gtk_widget_show (item); -} - -static void -gtk_combo_box_menu_row_deleted (GtkTreeModel *model, - GtkTreePath *path, - gpointer user_data) -{ - gint index; - GtkWidget *menu; - GtkWidget *item; - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - if (!combo_box->priv->popup_widget) - return; - - index = gtk_tree_path_get_indices (path)[0]; - - menu = combo_box->priv->popup_widget; - g_return_if_fail (GTK_IS_MENU (menu)); - - item = g_list_nth_data (GTK_MENU_SHELL (menu)->children, index); - g_return_if_fail (GTK_IS_MENU_ITEM (item)); - - gtk_container_remove (GTK_CONTAINER (menu), item); -} - -static void -gtk_combo_box_menu_rows_reordered (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gint *new_order, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - gtk_combo_box_relayout (combo_box); -} - -static void -gtk_combo_box_menu_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - gint width; - - if (!combo_box->priv->popup_widget) - return; - - if (combo_box->priv->wrap_width) - gtk_combo_box_relayout_item (combo_box, - gtk_tree_path_get_indices (path)[0]); - - width = gtk_combo_box_calc_requested_width (combo_box, path); - - if (width > combo_box->priv->width) - { - if (combo_box->priv->cell_view) - { - gtk_widget_set_size_request (combo_box->priv->cell_view, width, -1); - gtk_widget_queue_resize (combo_box->priv->cell_view); - } - combo_box->priv->width = width; - } -} - -/* - * list style - */ - -static void -gtk_combo_box_list_setup (GtkComboBox *combo_box) -{ - GSList *i; - GtkTreeSelection *sel; - - combo_box->priv->button = gtk_toggle_button_new (); - gtk_widget_set_parent (combo_box->priv->button, - GTK_BIN (combo_box)->child->parent); - g_signal_connect (combo_box->priv->button, "button_press_event", - G_CALLBACK (gtk_combo_box_list_button_pressed), combo_box); - g_signal_connect (combo_box->priv->button, "toggled", - G_CALLBACK (gtk_combo_box_button_toggled), combo_box); - g_signal_connect_after (combo_box, "key_press_event", - G_CALLBACK (gtk_combo_box_key_press), combo_box); - - combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (combo_box->priv->button), - combo_box->priv->arrow); - combo_box->priv->separator = NULL; - gtk_widget_show_all (combo_box->priv->button); - - if (combo_box->priv->cell_view) - { - combo_box->priv->cell_view_frame = gtk_frame_new (NULL); - gtk_widget_set_parent (combo_box->priv->cell_view_frame, - GTK_BIN (combo_box)->child->parent); - gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->cell_view_frame), - GTK_SHADOW_IN); - - gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view), - >K_WIDGET (combo_box)->style->base[GTK_WIDGET_STATE (combo_box)]); - - combo_box->priv->box = gtk_event_box_new (); - /* - gtk_event_box_set_visible_window (GTK_EVENT_BOX (combo_box->priv->box), - FALSE); - */ - - gtk_container_add (GTK_CONTAINER (combo_box->priv->cell_view_frame), - combo_box->priv->box); - - gtk_widget_show_all (combo_box->priv->cell_view_frame); - - g_signal_connect (combo_box->priv->box, "button_press_event", - G_CALLBACK (gtk_combo_box_list_button_pressed), - combo_box); - } - - combo_box->priv->tree_view = gtk_tree_view_new (); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view)); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (combo_box->priv->tree_view), - FALSE); - /* - _gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (combo_box->priv->tree_view), - TRUE); - */ - if (combo_box->priv->model) - gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view), - combo_box->priv->model); - - g_signal_connect (combo_box->priv->tree_view, "button_press_event", - G_CALLBACK (gtk_combo_box_list_button_pressed), - combo_box); - g_signal_connect (combo_box->priv->tree_view, "button_release_event", - G_CALLBACK (gtk_combo_box_list_button_released), - combo_box); - g_signal_connect (combo_box->priv->tree_view, "key_press_event", - G_CALLBACK (gtk_combo_box_list_key_press), - combo_box); - - combo_box->priv->column = gtk_tree_view_column_new (); - gtk_tree_view_append_column (GTK_TREE_VIEW (combo_box->priv->tree_view), - combo_box->priv->column); - - /* sync up */ - for (i = combo_box->priv->cells; i; i = i->next) - { - GSList *j; - ComboCellInfo *info = (ComboCellInfo *)i->data; - - if (info->pack == GTK_PACK_START) - gtk_tree_view_column_pack_start (combo_box->priv->column, - info->cell, info->expand); - else if (info->pack == GTK_PACK_END) - gtk_tree_view_column_pack_end (combo_box->priv->column, - info->cell, info->expand); - - for (j = info->attributes; j; j = j->next->next) - { - gtk_tree_view_column_add_attribute (combo_box->priv->column, - info->cell, - j->data, - GPOINTER_TO_INT (j->next->data)); - } - } - - if (combo_box->priv->active_item != -1) - { - GtkTreePath *path; - -#if GTK_CHECK_VERSION(2,2,0) - path = gtk_tree_path_new_from_indices (combo_box->priv->active_item, -1); -#else - char buf[32]; - g_snprintf(buf, sizeof(buf), "%d", combo_box->priv->active_item); - path = gtk_tree_path_new_from_string(buf); -#endif - if (path) - { - gtk_tree_view_set_cursor (GTK_TREE_VIEW (combo_box->priv->tree_view), - path, NULL, FALSE); - gtk_tree_path_free (path); - } - } - - /* set sample/popup widgets */ - gtk_combo_box_set_popup_widget (combo_box, combo_box->priv->tree_view); - - gtk_widget_show (combo_box->priv->tree_view); -} - -static void -gtk_combo_box_list_destroy (GtkComboBox *combo_box) -{ - /* disconnect signals */ - g_signal_handlers_disconnect_matched (combo_box->priv->tree_view, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, combo_box); - g_signal_handlers_disconnect_matched (combo_box->priv->button, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - gtk_combo_box_list_button_pressed, - NULL); - if (combo_box->priv->box) - g_signal_handlers_disconnect_matched (combo_box->priv->box, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - gtk_combo_box_list_button_pressed, - NULL); - - /* destroy things (unparent will kill the latest ref from us) - * last unref on button will destroy the arrow - */ - gtk_widget_unparent (combo_box->priv->button); - combo_box->priv->button = NULL; - combo_box->priv->arrow = NULL; - - if (combo_box->priv->cell_view) - { - g_object_set (G_OBJECT (combo_box->priv->cell_view), - "background_set", FALSE, - NULL); - } - - if (combo_box->priv->cell_view_frame) - { - gtk_widget_unparent (combo_box->priv->cell_view_frame); - combo_box->priv->cell_view_frame = NULL; - combo_box->priv->box = NULL; - } - - gtk_widget_destroy (combo_box->priv->tree_view); - - combo_box->priv->tree_view = NULL; - combo_box->priv->popup_widget = NULL; -} - -/* callbacks */ -static void -gtk_combo_box_list_remove_grabs (GtkComboBox *combo_box) -{ - if (combo_box->priv->tree_view && - GTK_WIDGET_HAS_GRAB (combo_box->priv->tree_view)) - { - gtk_grab_remove (combo_box->priv->tree_view); - } - - if (combo_box->priv->popup_window && - GTK_WIDGET_HAS_GRAB (combo_box->priv->popup_window)) - { - gtk_grab_remove (combo_box->priv->popup_window); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); - gdk_pointer_ungrab (GDK_CURRENT_TIME); - } -} - -static gboolean -gtk_combo_box_list_button_pressed (GtkWidget *widget, - GdkEventButton *event, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - - GtkWidget *ewidget = gtk_get_event_widget ((GdkEvent *)event); - - if (ewidget == combo_box->priv->tree_view) - return TRUE; - - if ((ewidget != combo_box->priv->button && ewidget != combo_box->priv->box) || - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button))) - return FALSE; - - gtk_combo_box_popup (combo_box); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button), - TRUE); - - combo_box->priv->popup_in_progress = TRUE; - - return TRUE; -} - -static gboolean -gtk_combo_box_list_button_released (GtkWidget *widget, - GdkEventButton *event, - gpointer data) -{ - gboolean ret; - GtkTreePath *path = NULL; - - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - - gboolean popup_in_progress = FALSE; - - GtkWidget *ewidget = gtk_get_event_widget ((GdkEvent *)event); - - if (combo_box->priv->popup_in_progress) - { - popup_in_progress = TRUE; - combo_box->priv->popup_in_progress = FALSE; - } - - if (ewidget != combo_box->priv->tree_view) - { - if (ewidget == combo_box->priv->button && - !popup_in_progress && - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button))) - { - gtk_combo_box_popdown (combo_box); - return TRUE; - } - - /* released outside treeview */ - if (ewidget != combo_box->priv->button) - { - gtk_combo_box_popdown (combo_box); - - return TRUE; - } - - return FALSE; - } - - /* select something cool */ - ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), - event->x, event->y, - &path, - NULL, NULL, NULL); - - if (!ret) - return TRUE; /* clicked outside window? */ - - gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]); - gtk_combo_box_popdown (combo_box); - - gtk_tree_path_free (path); - - return TRUE; -} - -static gboolean -gtk_combo_box_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - guint state = event->state & gtk_accelerator_get_default_mod_mask (); - gint items = 0; - gint index = gtk_combo_box_get_active (combo_box); - gint new_index; - - if (combo_box->priv->model) - items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL); - - if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) && - state == GDK_MOD1_MASK) - { - gtk_combo_box_popup (combo_box); - - return TRUE; - } - - switch (event->keyval) - { - case GDK_Down: - case GDK_KP_Down: - new_index = index + 1; - break; - case GDK_Up: - case GDK_KP_Up: - new_index = index - 1; - break; - case GDK_Page_Up: - case GDK_KP_Page_Up: - case GDK_Home: - case GDK_KP_Home: - new_index = 0; - break; - case GDK_Page_Down: - case GDK_KP_Page_Down: - case GDK_End: - case GDK_KP_End: - new_index = items - 1; - break; - default: - return FALSE; - } - - if (items > 0) - gtk_combo_box_set_active (combo_box, CLAMP (new_index, 0, items - 1)); - - return TRUE; -} - -static gboolean -gtk_combo_box_menu_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - guint state = event->state & gtk_accelerator_get_default_mod_mask (); - - if ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) && - state == GDK_MOD1_MASK) - { - gtk_combo_box_popdown (combo_box); - - return TRUE; - } - - return FALSE; -} - -static gboolean -gtk_combo_box_list_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - guint state = event->state & gtk_accelerator_get_default_mod_mask (); - - if (event->keyval == GDK_Escape || - ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) && - state == GDK_MOD1_MASK)) - { - /* reset active item -- this is incredibly lame and ugly */ - gtk_combo_box_set_active (combo_box, - gtk_combo_box_get_active (combo_box)); - - gtk_combo_box_popdown (combo_box); - - return TRUE; - } - - if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter || - event->keyval == GDK_space || event->keyval == GDK_KP_Space) - { - gboolean ret = FALSE; - GtkTreeIter iter; - GtkTreeModel *model = NULL; - - if (combo_box->priv->model) - { - GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view)); - - ret = gtk_tree_selection_get_selected (sel, &model, &iter); - } - if (ret) - { - GtkTreePath *path; - - path = gtk_tree_model_get_path (model, &iter); - if (path) - { - gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]); - gtk_tree_path_free (path); - } - } - - gtk_combo_box_popdown (combo_box); - - return TRUE; - } - - return FALSE; -} - -static void -gtk_combo_box_list_row_changed (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (data); - gint width; - - width = gtk_combo_box_calc_requested_width (combo_box, path); - - if (width > combo_box->priv->width) - { - if (combo_box->priv->cell_view) - { - gtk_widget_set_size_request (combo_box->priv->cell_view, width, -1); - gtk_widget_queue_resize (combo_box->priv->cell_view); - } - combo_box->priv->width = width; - } -} - -/* - * GtkCellLayout implementation - */ -static void -gtk_combo_box_cell_layout_pack_start (GtkCellLayout *layout, - GtkCellRenderer *cell, - gboolean expand) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - combo_box = GTK_COMBO_BOX (layout); - - g_object_ref (G_OBJECT (cell)); - gtk_object_sink (GTK_OBJECT (cell)); - - info = g_new0 (ComboCellInfo, 1); - info->cell = cell; - info->expand = expand; - info->pack = GTK_PACK_START; - - combo_box->priv->cells = g_slist_append (combo_box->priv->cells, info); - - if (combo_box->priv->cell_view) - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box->priv->cell_view), - cell, expand); - - if (combo_box->priv->column) - gtk_tree_view_column_pack_start (combo_box->priv->column, cell, expand); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (view), cell, expand); - } - g_list_free (list); - } -} - -static void -gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout, - GtkCellRenderer *cell, - gboolean expand) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - combo_box = GTK_COMBO_BOX (layout); - - g_object_ref (G_OBJECT (cell)); - gtk_object_sink (GTK_OBJECT (cell)); - - info = g_new0 (ComboCellInfo, 1); - info->cell = cell; - info->expand = expand; - info->pack = GTK_PACK_END; - - combo_box->priv->cells = g_slist_append (combo_box->priv->cells, info); - - if (combo_box->priv->cell_view) - gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (combo_box->priv->cell_view), - cell, expand); - - if (combo_box->priv->column) - gtk_tree_view_column_pack_end (combo_box->priv->column, cell, expand); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (view), cell, expand); - } - g_list_free (list); - } -} - -static void -gtk_combo_box_cell_layout_clear (GtkCellLayout *layout) -{ - GtkWidget *menu; - GtkComboBox *combo_box; - GSList *i; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - - combo_box = GTK_COMBO_BOX (layout); - - if (combo_box->priv->cell_view) - gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo_box->priv->cell_view)); - - if (combo_box->priv->column) - gtk_tree_view_column_clear (combo_box->priv->column); - - for (i = combo_box->priv->cells; i; i = i->next) - { - ComboCellInfo *info = (ComboCellInfo *)i->data; - - gtk_combo_box_cell_layout_clear_attributes (layout, info->cell); - g_object_unref (G_OBJECT (info->cell)); - g_free (info); - i->data = NULL; - } - g_slist_free (combo_box->priv->cells); - combo_box->priv->cells = NULL; - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_clear (GTK_CELL_LAYOUT (view)); - } - g_list_free (list); - } -} - -static void -gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout, - GtkCellRenderer *cell, - const gchar *attribute, - gint column) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - combo_box = GTK_COMBO_BOX (layout); - - info = gtk_combo_box_get_cell_info (combo_box, cell); - - info->attributes = g_slist_prepend (info->attributes, - GINT_TO_POINTER (column)); - info->attributes = g_slist_prepend (info->attributes, - g_strdup (attribute)); - - if (combo_box->priv->cell_view) - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box->priv->cell_view), - cell, attribute, column); - - if (combo_box->priv->column) - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box->priv->column), - cell, attribute, column); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (view), cell, - attribute, column); - } - g_list_free (list); - } - - gtk_widget_queue_resize (GTK_WIDGET (combo_box)); -} - -static void -gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout *layout, - GtkCellRenderer *cell, - GtkCellLayoutDataFunc func, - gpointer func_data, - GDestroyNotify destroy) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - - combo_box = GTK_COMBO_BOX (layout); - - info = gtk_combo_box_get_cell_info (combo_box, cell); - g_return_if_fail (info != NULL); - - if (info->destroy) - { - GDestroyNotify d = info->destroy; - - info->destroy = NULL; - d (info->func_data); - } - - info->func = func; - info->func_data = func_data; - info->destroy = destroy; - - if (combo_box->priv->cell_view) - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box->priv->cell_view), cell, func, func_data, NULL); - - if (combo_box->priv->column) - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box->priv->column), cell, func, func_data, NULL); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (view), cell, - func, func_data, NULL); - } - g_list_free (list); - } - - gtk_widget_queue_resize (GTK_WIDGET (combo_box)); -} - -static void -gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout, - GtkCellRenderer *cell) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - GSList *list; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - combo_box = GTK_COMBO_BOX (layout); - - info = gtk_combo_box_get_cell_info (combo_box, cell); - if (info) - { - list = info->attributes; - while (list && list->next) - { - g_free (list->data); - list = list->next->next; - } - g_slist_free (info->attributes); - info->attributes = NULL; - } - - if (combo_box->priv->cell_view) - gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (combo_box->priv->cell_view), cell); - - if (combo_box->priv->column) - gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (combo_box->priv->column), cell); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (view), cell); - } - g_list_free (list); - } - - gtk_widget_queue_resize (GTK_WIDGET (combo_box)); -} - -static void -gtk_combo_box_cell_layout_reorder (GtkCellLayout *layout, - GtkCellRenderer *cell, - gint position) -{ - ComboCellInfo *info; - GtkComboBox *combo_box; - GtkWidget *menu; - GSList *link; - - g_return_if_fail (GTK_IS_COMBO_BOX (layout)); - g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); - - combo_box = GTK_COMBO_BOX (layout); - - info = gtk_combo_box_get_cell_info (combo_box, cell); - - g_return_if_fail (info != NULL); - g_return_if_fail (position >= 0); - - link = g_slist_find (combo_box->priv->cells, info); - - g_return_if_fail (link != NULL); - - combo_box->priv->cells = g_slist_delete_link (combo_box->priv->cells, link); - combo_box->priv->cells = g_slist_insert (combo_box->priv->cells, info, - position); - - if (combo_box->priv->cell_view) - gtk_cell_layout_reorder (GTK_CELL_LAYOUT (combo_box->priv->cell_view), - cell, position); - - if (combo_box->priv->column) - gtk_cell_layout_reorder (GTK_CELL_LAYOUT (combo_box->priv->column), - cell, position); - - menu = combo_box->priv->popup_widget; - if (GTK_IS_MENU (menu)) - { - GList *i, *list; - - list = gtk_container_get_children (GTK_CONTAINER (menu)); - for (i = list; i; i = i->next) - { - GtkCellView *view; - - if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data)) - view = GTK_CELL_VIEW (GTK_BIN (i->data)->child); - else - view = GTK_CELL_VIEW (i->data); - - gtk_cell_layout_reorder (GTK_CELL_LAYOUT (view), cell, position); - } - g_list_free (list); - } - - gtk_widget_queue_draw (GTK_WIDGET (combo_box)); -} - -/* - * public API - */ - -/** - * gtk_combo_box_new: - * - * Creates a new empty #GtkComboBox. - * - * Return value: A new #GtkComboBox. - * - * Since: 2.4 - */ -GtkWidget * -gtk_combo_box_new (void) -{ - return GTK_WIDGET (g_object_new (GTK_TYPE_COMBO_BOX, NULL)); -} - -/** - * gtk_combo_box_new_with_model: - * @model: A #GtkTreeModel. - * - * Creates a new #GtkComboBox with the model initialized to @model. - * - * Return value: A new #GtkComboBox. - * - * Since: 2.4 - */ -GtkWidget * -gtk_combo_box_new_with_model (GtkTreeModel *model) -{ - GtkComboBox *combo_box; - - g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL); - - combo_box = GTK_COMBO_BOX (g_object_new (GTK_TYPE_COMBO_BOX, - "model", model, - NULL)); - - return GTK_WIDGET (combo_box); -} - -/** - * gtk_combo_box_set_wrap_width: - * @combo_box: A #GtkComboBox. - * @width: Preferred number of columns. - * - * Sets the wrap width of @combo_box to be @width. The wrap width is basically - * the preferred number of columns when you want to the popup to be layed out - * in a table. - * - * Since: 2.4 - */ -void -gtk_combo_box_set_wrap_width (GtkComboBox *combo_box, - gint width) -{ - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - g_return_if_fail (width >= 0); - - if (width != combo_box->priv->wrap_width) - { - combo_box->priv->wrap_width = width; - - gtk_combo_box_check_appearance (combo_box); - gtk_combo_box_relayout (combo_box); - - g_object_notify (G_OBJECT (combo_box), "wrap_width"); - } -} - -/** - * gtk_combo_box_set_row_span_column: - * @combo_box: A #GtkComboBox. - * @row_span: A column in the model passed during construction. - * - * Sets the column with row span information for @combo_box to be @row_span. - * The row span column contains integers which indicate how many rows - * an item should span. - * - * Since: 2.4 - */ -void -gtk_combo_box_set_row_span_column (GtkComboBox *combo_box, - gint row_span) -{ - gint col; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - col = gtk_tree_model_get_n_columns (combo_box->priv->model); - g_return_if_fail (row_span >= 0 && row_span < col); - - if (row_span != combo_box->priv->row_column) - { - combo_box->priv->row_column = row_span; - - gtk_combo_box_relayout (combo_box); - - g_object_notify (G_OBJECT (combo_box), "row_span_column"); - } -} - -/** - * gtk_combo_box_set_column_span_column: - * @combo_box: A #GtkComboBox. - * @column_span: A column in the model passed during construction. - * - * Sets the column with column span information for @combo_box to be - * @column_span. The column span column contains integers which indicate - * how many columns an item should span. - * - * Since: 2.4 - */ -void -gtk_combo_box_set_column_span_column (GtkComboBox *combo_box, - gint column_span) -{ - gint col; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - col = gtk_tree_model_get_n_columns (combo_box->priv->model); - g_return_if_fail (column_span >= 0 && column_span < col); - - if (column_span != combo_box->priv->col_column) - { - combo_box->priv->col_column = column_span; - - gtk_combo_box_relayout (combo_box); - - g_object_notify (G_OBJECT (combo_box), "column_span_column"); - } -} - -/** - * gtk_combo_box_get_active: - * @combo_box: A #GtkComboBox. - * - * Returns the index of the currently active item, or -1 if there's no - * active item. - * - * Return value: An integer which is the index of the currently active item, or - * -1 if there's no active item. - * - * Since: 2.4 - */ -gint -gtk_combo_box_get_active (GtkComboBox *combo_box) -{ - g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), 0); - - return combo_box->priv->active_item; -} - -/** - * gtk_combo_box_set_active: - * @combo_box: A #GtkComboBox. - * @index_: An index in the model passed during construction, or -1 to have - * no active item. - * - * Sets the active item of @combo_box to be the item at @index. - * - * Since: 2.4 - */ -void -gtk_combo_box_set_active (GtkComboBox *combo_box, - gint index_) -{ - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - /* -1 means "no item selected" */ - g_return_if_fail (index_ >= -1); - - if (combo_box->priv->active_item == index_) - return; - - gtk_combo_box_set_active_internal (combo_box, index_); -} - -static void -gtk_combo_box_set_active_internal (GtkComboBox *combo_box, - gint index) -{ - GtkTreePath *path; - - combo_box->priv->active_item = index; - - if (index == -1) - { - if (combo_box->priv->tree_view) - gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view))); - else - { - GtkMenu *menu = GTK_MENU (combo_box->priv->popup_widget); - - if (GTK_IS_MENU (menu)) - gtk_menu_set_active (menu, -1); - } - - if (combo_box->priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL); - } - else - { -#if GTK_CHECK_VERSION(2,2,0) - path = gtk_tree_path_new_from_indices (index, -1); -#else - char buf[32]; - g_snprintf(buf, sizeof(buf), "%d", index); - path = gtk_tree_path_new_from_string(buf); -#endif - - if (combo_box->priv->tree_view) - gtk_tree_view_set_cursor (GTK_TREE_VIEW (combo_box->priv->tree_view), path, NULL, FALSE); - else - { - GtkMenu *menu = GTK_MENU (combo_box->priv->popup_widget); - - if (GTK_IS_MENU (menu)) - gtk_menu_set_active (GTK_MENU (menu), index); - } - - if (combo_box->priv->cell_view) - gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), path); - - gtk_tree_path_free (path); - } - - g_signal_emit_by_name (combo_box, "changed", NULL, NULL); -} - - -/** - * gtk_combo_box_get_active_iter: - * @combo_box: A #GtkComboBox - * @iter: The uninitialized #GtkTreeIter. - * - * Sets @iter to point to the current active item, if it exists. - * - * Return value: %TRUE, if @iter was set - * - * Since: 2.4 - **/ -gboolean -gtk_combo_box_get_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter) -{ - GtkTreePath *path; - gint active; - gboolean retval; -#if !GTK_CHECK_VERSION(2,2,0) - char buf[32]; -#endif - - g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), FALSE); - - active = gtk_combo_box_get_active (combo_box); - if (active < 0) - return FALSE; - -#if GTK_CHECK_VERSION(2,2,0) - path = gtk_tree_path_new_from_indices (active, -1); -#else - g_snprintf(buf, sizeof(buf), "%d", active); - path = gtk_tree_path_new_from_string(buf); -#endif - retval = gtk_tree_model_get_iter (gtk_combo_box_get_model (combo_box), - iter, path); - gtk_tree_path_free (path); - - return retval; -} - -/** - * gtk_combo_box_set_active_iter: - * @combo_box: A #GtkComboBox - * @iter: The #GtkTreeIter. - * - * Sets the current active item to be the one referenced by @iter. - * @iter must correspond to a path of depth one. - * - * Since: 2.4 - **/ -void -gtk_combo_box_set_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter) -{ - GtkTreePath *path; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo_box), iter); - g_return_if_fail (path != NULL); - g_return_if_fail (gtk_tree_path_get_depth (path) == 1); - - gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]); - gtk_tree_path_free (path); -} - -/** - * gtk_combo_box_set_model: - * @combo_box: A #GtkComboBox. - * @model: A #GtkTreeModel. - * - * Sets the model used by @combo_box to be @model. Will unset a previously set - * model (if applicable). If @model is %NULL, then it will unset the model. - * - * Note that this function does not clear the cell renderers, you have to - * call gtk_combo_box_cell_layout_clear() yourself if you need to set up - * different cell renderers for the new model. - * - * Since: 2.4 - */ -void -gtk_combo_box_set_model (GtkComboBox *combo_box, - GtkTreeModel *model) -{ - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - - if (!model) - { - gtk_combo_box_unset_model (combo_box); - return; - } - - g_return_if_fail (GTK_IS_TREE_MODEL (model)); - - if (model == combo_box->priv->model) - return; - - if (combo_box->priv->model) - gtk_combo_box_unset_model (combo_box); - - combo_box->priv->model = model; - g_object_ref (G_OBJECT (combo_box->priv->model)); - - combo_box->priv->inserted_id = - g_signal_connect (combo_box->priv->model, "row_inserted", - G_CALLBACK (gtk_combo_box_model_row_inserted), - combo_box); - combo_box->priv->deleted_id = - g_signal_connect (combo_box->priv->model, "row_deleted", - G_CALLBACK (gtk_combo_box_model_row_deleted), - combo_box); - combo_box->priv->reordered_id = - g_signal_connect (combo_box->priv->model, "rows_reordered", - G_CALLBACK (gtk_combo_box_model_rows_reordered), - combo_box); - combo_box->priv->changed_id = - g_signal_connect (combo_box->priv->model, "row_changed", - G_CALLBACK (gtk_combo_box_model_row_changed), - combo_box); - - if (combo_box->priv->tree_view) - { - /* list mode */ - gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view), - combo_box->priv->model); - } - else - { - /* menu mode */ - if (combo_box->priv->popup_widget) - gtk_combo_box_menu_fill (combo_box); - - } - - if (combo_box->priv->cell_view) - gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view), - combo_box->priv->model); -} - -/** - * gtk_combo_box_get_model - * @combo_box: A #GtkComboBox. - * - * Returns the #GtkTreeModel which is acting as data source for @combo_box. - * - * Return value: A #GtkTreeModel which was passed during construction. - * - * Since: 2.4 - */ -GtkTreeModel * -gtk_combo_box_get_model (GtkComboBox *combo_box) -{ - g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL); - - return combo_box->priv->model; -} - - -/* convenience API for simple text combos */ - -/** - * gtk_combo_box_new_text: - * - * Convenience function which constructs a new text combo box, which is a - * #GtkComboBox just displaying strings. If you use this function to create - * a text combo box, you should only manipulate its data source with the - * following convenience functions: gtk_combo_box_append_text(), - * gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and - * gtk_combo_box_remove_text(). - * - * Return value: A new text combo box. - * - * Since: 2.4 - */ -GtkWidget * -gtk_combo_box_new_text (void) -{ - GtkWidget *combo_box; - GtkCellRenderer *cell; - GtkListStore *store; - - store = gtk_list_store_new (1, G_TYPE_STRING); - combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); - g_object_unref (store); - - cell = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell, - "text", 0, - NULL); - - return combo_box; -} - -/** - * gtk_combo_box_append_text: - * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text(). - * @text: A string. - * - * Appends @string to the list of strings stored in @combo_box. Note that - * you can only use this function with combo boxes constructed with - * gtk_combo_box_new_text(). - * - * Since: 2.4 - */ -void -gtk_combo_box_append_text (GtkComboBox *combo_box, - const gchar *text) -{ - GtkTreeIter iter; - GtkListStore *store; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); - g_return_if_fail (text != NULL); - - store = GTK_LIST_STORE (combo_box->priv->model); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, text, -1); -} - -/** - * gtk_combo_box_insert_text: - * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text(). - * @position: An index to insert @text. - * @text: A string. - * - * Inserts @string at @position in the list of strings stored in @combo_box. - * Note that you can only use this function with combo boxes constructed - * with gtk_combo_box_new_text(). - * - * Since: 2.4 - */ -void -gtk_combo_box_insert_text (GtkComboBox *combo_box, - gint position, - const gchar *text) -{ - GtkTreeIter iter; - GtkListStore *store; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); - g_return_if_fail (position >= 0); - g_return_if_fail (text != NULL); - - store = GTK_LIST_STORE (combo_box->priv->model); - - gtk_list_store_insert (store, &iter, position); - gtk_list_store_set (store, &iter, 0, text, -1); -} - -/** - * gtk_combo_box_prepend_text: - * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text(). - * @text: A string. - * - * Prepends @string to the list of strings stored in @combo_box. Note that - * you can only use this function with combo boxes constructed with - * gtk_combo_box_new_text(). - * - * Since: 2.4 - */ -void -gtk_combo_box_prepend_text (GtkComboBox *combo_box, - const gchar *text) -{ - GtkTreeIter iter; - GtkListStore *store; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); - g_return_if_fail (text != NULL); - - store = GTK_LIST_STORE (combo_box->priv->model); - - gtk_list_store_prepend (store, &iter); - gtk_list_store_set (store, &iter, 0, text, -1); -} - -/** - * gtk_combo_box_remove_text: - * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text(). - * @position: Index of the item to remove. - * - * Removes the string at @position from @combo_box. Note that you can only use - * this function with combo boxes constructed with gtk_combo_box_new_text(). - * - * Since: 2.4 - */ -void -gtk_combo_box_remove_text (GtkComboBox *combo_box, - gint position) -{ - GtkTreeIter iter; - GtkListStore *store; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); - g_return_if_fail (position >= 0); - - store = GTK_LIST_STORE (combo_box->priv->model); - - if (gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter, - NULL, position)) - gtk_list_store_remove (store, &iter); -} - -static gboolean -gtk_combo_box_mnemonic_activate (GtkWidget *widget, - gboolean group_cycling) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - - gtk_widget_grab_focus (combo_box->priv->button); - - return TRUE; -} - -static void -gtk_combo_box_destroy (GtkObject *object) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (object); - - gtk_combo_box_popdown (combo_box); - - combo_box->priv->destroying = 1; - - GTK_OBJECT_CLASS (parent_class)->destroy (object); - combo_box->priv->cell_view = NULL; - - combo_box->priv->destroying = 0; -} - -static void -gtk_combo_box_finalize (GObject *object) -{ - GtkComboBox *combo_box = GTK_COMBO_BOX (object); - GSList *i; - - if (GTK_IS_MENU (combo_box->priv->popup_widget)) - { - gtk_combo_box_menu_destroy (combo_box); - gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget)); - combo_box->priv->popup_widget = NULL; - } - - if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view)) - gtk_combo_box_list_destroy (combo_box); - - if (combo_box->priv->popup_window) - gtk_widget_destroy (combo_box->priv->popup_window); - - gtk_combo_box_unset_model (combo_box); - - for (i = combo_box->priv->cells; i; i = i->next) - { - ComboCellInfo *info = (ComboCellInfo *)i->data; - GSList *list = info->attributes; - - if (info->destroy) - info->destroy (info->func_data); - - while (list && list->next) - { - g_free (list->data); - list = list->next->next; - } - g_slist_free (info->attributes); - - g_object_unref (G_OBJECT (info->cell)); - g_free (info); - } - g_slist_free (combo_box->priv->cells); - - g_free (combo_box->priv); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - - -/** - * Code below this point has been pulled in from gtkmenu.c in 2.4.14 - * and is needed to provide gtk_menu_attach() - */ - -typedef struct -{ - gint left_attach; - gint right_attach; - gint top_attach; - gint bottom_attach; - gint effective_left_attach; - gint effective_right_attach; - gint effective_top_attach; - gint effective_bottom_attach; -} AttachInfo; - -#define ATTACH_INFO_KEY "gtk-menu-child-attach-info-key" - -static AttachInfo * -get_attach_info (GtkWidget *child) -{ - GObject *object = G_OBJECT (child); - AttachInfo *ai = g_object_get_data (object, ATTACH_INFO_KEY); - - if (!ai) - { - ai = g_new0 (AttachInfo, 1); - g_object_set_data_full (object, ATTACH_INFO_KEY, ai, g_free); - } - - return ai; -} - -/** - * gtk_menu_attach: - * @menu: a #GtkMenu. - * @child: a #GtkMenuItem. - * @left_attach: The column number to attach the left side of the item to. - * @right_attach: The column number to attach the right side of the item to. - * @top_attach: The row number to attach the top of the item to. - * @bottom_attach: The row number to attach the bottom of the item to. - * - * Adds a new #GtkMenuItem to a (table) menu. The number of 'cells' that - * an item will occupy is specified by @left_attach, @right_attach, - * @top_attach and @bottom_attach. These each represent the leftmost, - * rightmost, uppermost and lower column and row numbers of the table. - * (Columns and rows are indexed from zero). - * - * Note that this function is not related to gtk_menu_detach(). - * - * Since: 2.4 - **/ -static void -gtk_menu_attach (GtkMenu *menu, - GtkWidget *child, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach) -{ - GtkMenuShell *menu_shell; - - g_return_if_fail (GTK_IS_MENU (menu)); - g_return_if_fail (GTK_IS_MENU_ITEM (child)); - g_return_if_fail (child->parent == NULL || - child->parent == GTK_WIDGET (menu)); - g_return_if_fail (left_attach < right_attach); - g_return_if_fail (top_attach < bottom_attach); - - menu_shell = GTK_MENU_SHELL (menu); - - if (!child->parent) - { - AttachInfo *ai = get_attach_info (child); - - ai->left_attach = left_attach; - ai->right_attach = right_attach; - ai->top_attach = top_attach; - ai->bottom_attach = bottom_attach; - - menu_shell->children = g_list_append (menu_shell->children, child); - - gtk_widget_set_parent (child, GTK_WIDGET (menu)); - - /* - menu_queue_resize (menu); - */ - } - else - { - gtk_container_child_set (GTK_CONTAINER (child->parent), child, - "left_attach", left_attach, - "right_attach", right_attach, - "top_attach", top_attach, - "bottom_attach", bottom_attach, - NULL); - } -} -#endif /* Gtk 2.4 */ - -gchar * -gtk_combo_box_get_active_text (GtkComboBox *combo_box) -{ - GtkTreeIter iter; - gchar *text = NULL; - - /* g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL); */ - - if (gtk_combo_box_get_active_iter (combo_box, &iter)) - gtk_tree_model_get (gtk_combo_box_get_model(combo_box), &iter, - 0, &text, -1); - return text; -} - -#endif
--- a/pidgin/pidgincombobox.h Sat Oct 03 21:30:52 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -/* gtkcombobox.h - * Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org> - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02111-1301, USA. - */ - -#ifndef __PIDGIN_COMBO_BOX_H__ -#define __PIDGIN_COMBO_BOX_H__ - -#ifndef __GTK_COMBO_BOX_H__ -#define __GTK_COMBO_BOX_H__ - -#include <gtk/gtkbin.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtktreeview.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_COMBO_BOX (gtk_combo_box_get_type ()) -#define GTK_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX, GtkComboBox)) -#define GTK_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX, GtkComboBoxClass)) -#define GTK_IS_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX)) -#define GTK_IS_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX)) -#define GTK_COMBO_BOX_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX, GtkComboBoxClass)) - -typedef struct _GtkComboBox GtkComboBox; -typedef struct _GtkComboBoxClass GtkComboBoxClass; -typedef struct _GtkComboBoxPrivate GtkComboBoxPrivate; - -struct _GtkComboBox -{ - GtkBin parent_instance; - - /*< private >*/ - GtkComboBoxPrivate *priv; -}; - -struct _GtkComboBoxClass -{ - GtkBinClass parent_class; - - /* signals */ - void (* changed) (GtkComboBox *combo_box); - - /* Padding for future expansion */ - void (*_gtk_reserved0) (void); - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); -}; - - -/* construction */ -GType gtk_combo_box_get_type (void); -GtkWidget *gtk_combo_box_new (void); -GtkWidget *gtk_combo_box_new_with_model (GtkTreeModel *model); - -/* grids */ -void gtk_combo_box_set_wrap_width (GtkComboBox *combo_box, - gint width); -void gtk_combo_box_set_row_span_column (GtkComboBox *combo_box, - gint row_span); -void gtk_combo_box_set_column_span_column (GtkComboBox *combo_box, - gint column_span); - -/* get/set active item */ -gint gtk_combo_box_get_active (GtkComboBox *combo_box); -void gtk_combo_box_set_active (GtkComboBox *combo_box, - gint index_); -gboolean gtk_combo_box_get_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter); -void gtk_combo_box_set_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter); - -/* getters and setters */ -void gtk_combo_box_set_model (GtkComboBox *combo_box, - GtkTreeModel *model); -GtkTreeModel *gtk_combo_box_get_model (GtkComboBox *combo_box); - -/* convenience -- text */ -GtkWidget *gtk_combo_box_new_text (void); -void gtk_combo_box_append_text (GtkComboBox *combo_box, - const gchar *text); -void gtk_combo_box_insert_text (GtkComboBox *combo_box, - gint position, - const gchar *text); -void gtk_combo_box_prepend_text (GtkComboBox *combo_box, - const gchar *text); -void gtk_combo_box_remove_text (GtkComboBox *combo_box, - gint position); -/* programmatic control */ -void gtk_combo_box_popup (GtkComboBox *combo_box); -void gtk_combo_box_popdown (GtkComboBox *combo_box); - -G_END_DECLS - -#endif /* __GTK_COMBO_BOX_H__ */ - -gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box); - -#endif /* __PIDGIN_COMBOX_BOX_H__ */
--- a/pidgin/pidginstock.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/pidginstock.c Sat Oct 03 21:31:14 2009 +0000 @@ -53,49 +53,29 @@ } const stock_icons[] = { { PIDGIN_STOCK_ACTION, NULL, GTK_STOCK_EXECUTE }, -#if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, -#else - { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" }, -#endif { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, -#if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, -#else - { PIDGIN_STOCK_DISCONNECT, "icons", "stock_disconnect_16.png" }, -#endif { PIDGIN_STOCK_FGCOLOR, "buttons", "change-fgcolor-small.png" }, -#if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_EDIT, NULL, GTK_STOCK_EDIT }, -#else - { PIDGIN_STOCK_EDIT, "buttons", "edit.png" }, -#endif { PIDGIN_STOCK_FILE_CANCELED, NULL, GTK_STOCK_CANCEL }, { PIDGIN_STOCK_FILE_DONE, NULL, GTK_STOCK_APPLY }, { PIDGIN_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR }, { PIDGIN_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, { PIDGIN_STOCK_ADD, NULL, GTK_STOCK_ADD }, -#if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE }, -#else - { PIDGIN_STOCK_PAUSE, "buttons", "pause.png" }, -#endif { PIDGIN_STOCK_POUNCE, NULL, GTK_STOCK_REDO }, { PIDGIN_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, { PIDGIN_STOCK_SIGN_OFF, NULL, GTK_STOCK_CLOSE }, { PIDGIN_STOCK_TYPED, "pidgin", "typed.png" }, { PIDGIN_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, -#if GTK_CHECK_VERSION(2,8,0) { PIDGIN_STOCK_INFO, NULL, GTK_STOCK_INFO }, -#else - { PIDGIN_STOCK_INFO, "buttons", "info.png" }, -#endif }; static const GtkStockItem stock_items[] = @@ -239,7 +219,6 @@ find_file_common(const char *name) { gchar *filename; -#if GLIB_CHECK_VERSION(2,6,0) const gchar *userdir; const gchar * const *sysdirs; @@ -256,7 +235,6 @@ return filename; g_free(filename); } -#endif filename = g_build_filename(DATADIR, name, NULL); if (g_file_test(filename, G_FILE_TEST_EXISTS)) return filename; @@ -413,11 +391,9 @@ static void reload_settings(void) { -#if GTK_CHECK_VERSION(2,4,0) GtkSettings *setting = NULL; setting = gtk_settings_get_default(); gtk_rc_reset_styles(setting); -#endif } /*****************************************************************************
--- a/pidgin/pidgintooltip.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/pidgintooltip.c Sat Oct 03 21:31:14 2009 +0000 @@ -119,9 +119,7 @@ tipwindow = gtk_window_new(GTK_WINDOW_POPUP); name = gtk_window_get_title(GTK_WINDOW(pidgin_tooltip.widget)); -#if GTK_CHECK_VERSION(2,10,0) gtk_window_set_type_hint(GTK_WINDOW(tipwindow), GDK_WINDOW_TYPE_HINT_TOOLTIP); -#endif gtk_widget_set_app_paintable(tipwindow, TRUE); gtk_window_set_title(GTK_WINDOW(tipwindow), name ? name : _("Pidgin Tooltip")); gtk_window_set_resizable(GTK_WINDOW(tipwindow), FALSE); @@ -136,41 +134,26 @@ { int sig; int scr_w, scr_h, x, y, dy; -#if GTK_CHECK_VERSION(2,2,0) int mon_num; GdkScreen *screen = NULL; -#endif GdkRectangle mon_size; GtkWidget *tipwindow = pidgin_tooltip.tipwindow; -#if GTK_CHECK_VERSION(2,2,0) gdk_display_get_pointer(gdk_display_get_default(), &screen, &x, &y, NULL); mon_num = gdk_screen_get_monitor_at_point(screen, x, y); gdk_screen_get_monitor_geometry(screen, mon_num, &mon_size); scr_w = mon_size.width + mon_size.x; scr_h = mon_size.height + mon_size.y; -#else - scr_w = gdk_screen_width(); - scr_h = gdk_screen_height(); - gdk_window_get_pointer(NULL, &x, &y, NULL); - mon_size.x = 0; - mon_size.y = 0; -#endif -#if GTK_CHECK_VERSION(2,4,0) dy = gdk_display_get_default_cursor_size(gdk_display_get_default()) / 2; -#else - dy = 0; -#endif -#if GTK_CHECK_VERSION(2,2,0) if (w > mon_size.width) w = mon_size.width - 10; if (h > mon_size.height) h = mon_size.height - 10; -#endif + x -= ((w >> 1) + 4); if ((y + h + 4) > scr_h)
--- a/pidgin/plugins/gestures/gestures.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/plugins/gestures/gestures.c Sat Oct 03 21:31:14 2009 +0000 @@ -57,11 +57,7 @@ { int count, current; -#if GTK_CHECK_VERSION(2,2,0) count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook)); -#else - count = g_list_length(GTK_NOTEBOOK(win->notebook)->children); -#endif current = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook)); if (dir == GTK_DIR_LEFT)
--- a/pidgin/plugins/perl/common/Makefile.mingw Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/plugins/perl/common/Makefile.mingw Sat Oct 03 21:31:14 2009 +0000 @@ -22,6 +22,7 @@ -I$(PIDGIN_TOP)/win32 \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/gtk-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \
--- a/pidgin/plugins/pidginrc.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/plugins/pidginrc.c Sat Oct 03 21:31:14 2009 +0000 @@ -198,17 +198,13 @@ purplerc_make_changes(void) { GString *str = make_gtkrc_string(); -#if GTK_CHECK_VERSION(2,4,0) GtkSettings *setting = NULL; -#endif gtk_rc_parse_string(str->str); g_string_free(str, TRUE); -#if GTK_CHECK_VERSION(2,4,0) setting = gtk_settings_get_default(); gtk_rc_reset_styles(setting); -#endif } static void
--- a/pidgin/plugins/spellchk.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/plugins/spellchk.c Sat Oct 03 21:31:14 2009 +0000 @@ -2081,24 +2081,11 @@ g_string_free(data, TRUE); } -#if !GTK_CHECK_VERSION(2,2,0) -static void -count_selected_helper(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer user_data) -{ - (*(gint *)user_data)++; -} -#endif - static void on_selection_changed(GtkTreeSelection *sel, gpointer data) { gint num_selected; -#if GTK_CHECK_VERSION(2,2,0) num_selected = gtk_tree_selection_count_selected_rows(sel); -#else - gtk_tree_selection_selected_foreach(sel, count_selected_helper, &num_selected); -#endif gtk_widget_set_sensitive((GtkWidget*)data, (num_selected > 0)); }
--- a/pidgin/plugins/xmppconsole.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/plugins/xmppconsole.c Sat Oct 03 21:31:14 2009 +0000 @@ -26,9 +26,6 @@ #include "xmlnode.h" #include "gtkimhtml.h" -#if !GTK_CHECK_VERSION(2,4,0) -#include "pidgincombobox.h" -#endif #include "gtkutils.h" typedef struct { @@ -734,9 +731,7 @@ GtkTextBuffer *buffer; GtkWidget *toolbar; GList *connections; -#if GTK_CHECK_VERSION(2,4,0) GtkToolItem *button; -#endif if (console) { gtk_window_present(GTK_WINDOW(console->window)); @@ -783,32 +778,17 @@ gtk_container_add(GTK_CONTAINER(sw), console->imhtml); toolbar = gtk_toolbar_new(); -#if GTK_CHECK_VERSION(2,4,0) button = gtk_tool_button_new(NULL, "<iq/>"); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL); gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); -#else - gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>", - _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL); -#endif -#if GTK_CHECK_VERSION(2,4,0) button = gtk_tool_button_new(NULL, "<presence/>"); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL); gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); -#else - gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>", - _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL); -#endif -#if GTK_CHECK_VERSION(2,4,0) button = gtk_tool_button_new(NULL, "<message/>"); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL); gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); -#else - gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>", - _("Insert a <message/> stanza."), "foo", gtk_label_new(NULL), GTK_SIGNAL_FUNC(message_clicked_cb), NULL); -#endif gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
--- a/pidgin/win32/gtkdocklet-win32.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Sat Oct 03 21:31:14 2009 +0000 @@ -585,12 +585,7 @@ G_CALLBACK(dummy_button_cb), NULL); image = gtk_image_new(); -#if GLIB_CHECK_VERSION(2,10,0) g_object_ref_sink(image); -#else - g_object_ref(image); - gtk_object_sink(GTK_OBJECT(image)); -#endif osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&osinfo);
--- a/pidgin/win32/gtkwin32dep.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/gtkwin32dep.c Sat Oct 03 21:31:14 2009 +0000 @@ -142,56 +142,33 @@ void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz) { + SHELLEXECUTEINFOW wsinfo; + wchar_t *w_uri, *w_verb, *w_clazz = NULL; + g_return_if_fail(target != NULL); g_return_if_fail(verb != NULL); - if (G_WIN32_HAVE_WIDECHAR_API()) { - SHELLEXECUTEINFOW wsinfo; - wchar_t *w_uri, *w_verb, *w_clazz = NULL; - - w_uri = g_utf8_to_utf16(target, -1, NULL, NULL, NULL); - w_verb = g_utf8_to_utf16(verb, -1, NULL, NULL, NULL); - - memset(&wsinfo, 0, sizeof(wsinfo)); - wsinfo.cbSize = sizeof(wsinfo); - wsinfo.lpVerb = w_verb; - wsinfo.lpFile = w_uri; - wsinfo.nShow = SW_SHOWNORMAL; - if (clazz != NULL) { - w_clazz = g_utf8_to_utf16(clazz, -1, NULL, NULL, NULL); - wsinfo.fMask |= SEE_MASK_CLASSNAME; - wsinfo.lpClass = w_clazz; - } - - if(!ShellExecuteExW(&wsinfo)) - purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n", - target, (int) wsinfo.hInstApp); + w_uri = g_utf8_to_utf16(target, -1, NULL, NULL, NULL); + w_verb = g_utf8_to_utf16(verb, -1, NULL, NULL, NULL); - g_free(w_uri); - g_free(w_verb); - g_free(w_clazz); - } else { - SHELLEXECUTEINFOA sinfo; - gchar *locale_uri; - - locale_uri = g_locale_from_utf8(target, -1, NULL, NULL, NULL); + memset(&wsinfo, 0, sizeof(wsinfo)); + wsinfo.cbSize = sizeof(wsinfo); + wsinfo.lpVerb = w_verb; + wsinfo.lpFile = w_uri; + wsinfo.nShow = SW_SHOWNORMAL; + if (clazz != NULL) { + w_clazz = g_utf8_to_utf16(clazz, -1, NULL, NULL, NULL); + wsinfo.fMask |= SEE_MASK_CLASSNAME; + wsinfo.lpClass = w_clazz; + } - memset(&sinfo, 0, sizeof(sinfo)); - sinfo.cbSize = sizeof(sinfo); - sinfo.lpVerb = verb; - sinfo.lpFile = locale_uri; - sinfo.nShow = SW_SHOWNORMAL; - if (clazz != NULL) { - sinfo.fMask |= SEE_MASK_CLASSNAME; - sinfo.lpClass = clazz; - } + if(!ShellExecuteExW(&wsinfo)) + purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n", + target, (int) wsinfo.hInstApp); - if(!ShellExecuteExA(&sinfo)) - purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n", - target, (int) sinfo.hInstApp); - - g_free(locale_uri); - } + g_free(w_uri); + g_free(w_verb); + g_free(w_clazz); }
--- a/pidgin/win32/nsis/langmacros.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/langmacros.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -51,7 +51,6 @@ ; GTK+ Directory Page !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE ${CUR_LANG} ; Installer Finish Page !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE ${CUR_LANG}
--- a/pidgin/win32/nsis/pidgin-installer.nsi Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Sat Oct 03 21:31:14 2009 +0000 @@ -12,7 +12,6 @@ Var ISSILENT Var STARTUP_RUN_KEY Var SPELLCHECK_SEL -Var LANGUAGE_SET ;-------------------------------- ;Configuration @@ -70,7 +69,7 @@ !define STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" !define PIDGIN_UNINST_EXE "pidgin-uninst.exe" -!define GTK_MIN_VERSION "2.6.10" +!define GTK_MIN_VERSION "2.14.0" !define GTK_REG_KEY "SOFTWARE\GTK\2.0" !define PERL_REG_KEY "SOFTWARE\Perl" !define PERL_DLL "perl510.dll" @@ -1342,12 +1341,10 @@ IfSilent 0 +2 StrCpy $ISSILENT "/NOUI" - StrCpy $LANGUAGE_SET "0" ClearErrors ${GetOptions} "$R3" "/L=" $R1 IfErrors +4 StrCpy $LANGUAGE $R1 - StrCpy $LANGUAGE_SET "1" Goto skip_lang ; Select Language @@ -1411,17 +1408,6 @@ Pop $R0 FunctionEnd -Function .onInstSuccess - ; NSIS doesn't appear to save the language when in Silent Mode, so we do so manually - IfSilent 0 done - - StrCmp $LANGUAGE_SET "0" done - - WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE - - done: -FunctionEnd - Function un.onInit Call un.RunCheck StrCpy $name "Pidgin ${PIDGIN_VERSION}" @@ -1467,15 +1453,6 @@ !insertmacro UnselectSection ${SecGtk} gtk_selection_done: - ; If on Win95/98/ME warn them that the GTK+ version wont work - ${Unless} ${IsNT} - !insertmacro UnselectSection ${SecGtk} - !insertmacro SetSectionFlag ${SecGtk} ${SF_RO} - MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK - IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version - Quit - ${EndIf} - done: Pop $R2 Pop $R1
--- a/pidgin/win32/nsis/translations/afrikaans.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/afrikaans.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -32,7 +32,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "'n Ou weergawe van die GTK+-looptyd is gevind. Wil u opgradeer?$\rLet wel: $(^Name) werk dalk net as u so maak." -!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me is onversoenbaar met GTK+ 2.8.0 en nuwer. GTK+ ${GTK_INSTALL_VERSION} sal nie installeer nie.$\rIndien u nie GTK+ ${GTK_MIN_VERSION} of nuwer reeds genstalleer het nie, sal die installasie nou staak." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Besoek die WinPidgin-webblad"
--- a/pidgin/win32/nsis/translations/arabic.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/arabic.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -30,7 +30,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT " +. ˿$\r: $(^Name) ." -!define GTK_WINDOWS_INCOMPATIBLE " 95/98/Me + 2.8.0 . + ${GTK_INSTALL_VERSION} .$\r + ${GTK_MIN_VERSION} ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " "
--- a/pidgin/win32/nsis/translations/basque.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/basque.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -30,7 +30,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "GTK+ exekuzio-ingurunearen bertsio zahar bat aurkitu da. Eguneratu egin nahi al duzu?$\rOharra: Bestela, posible da $(^Name) ez ibiltzea." -!define GTK_WINDOWS_INCOMPATIBLE "GTK+ 2.8.0 eta berriagoekin bateraezinak dira Windows 95/98/Me. Ez da GTK+ ${GTK_INSTALL_VERSION} instalatuko.$\rJadanik ez badaukazu GTK+ ${GTK_MIN_VERSION} edo berriagorik instalatuta, bertan behera utziko da instalazioa." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Pidgin Webgunera etorri"
--- a/pidgin/win32/nsis/translations/english.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/english.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -35,7 +35,6 @@ ; GTK+ Directory Page !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT "An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: $(^Name) may not work unless you do." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer. GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort." ; Installer Finish Page !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE "Visit the Pidgin Web Page"
--- a/pidgin/win32/nsis/translations/french.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/french.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -36,7 +36,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Une ancienne version des bibliothques GTK+ a t trouve. Voulez-vous la mettre jour ?$\rNote : $(^Name) peut ne pas fonctionner si vous ne le faites pas." -!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me est incompatible avec GTK+ version 2.8.0 ou plus rcentes. GTK+ ${GTK_INSTALL_VERSION} ne sera pas install.$\rSi vous n'avez pas install GTK+ version ${GTK_MIN_VERSION} ou pkus rcente, l'installation s'arrtera." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visitez la page web de Pidgin Windows"
--- a/pidgin/win32/nsis/translations/german.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/german.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -33,7 +33,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Eine alte Version der GTK+ Runtime wurde gefunden. Mchten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren." -!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me sind inkompatibel zu GTK+ 2.8.0 oder neuer. GTK+ ${GTK_INSTALL_VERSION} wird nicht installiert.$\rWenn Sie nicht GTK+ ${GTK_MIN_VERSION} oder neuer installiert haben, wird die Installation jetzt abgebrochen." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Besuchen Sie die Pidgin Webseite"
--- a/pidgin/win32/nsis/translations/hebrew.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/hebrew.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -33,7 +33,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "A?. GTK+ $\rNote: . $(^Name)" -!define GTK_WINDOWS_INCOMPATIBLE " 95/98/ -GTK+ 2.8.0 . GTK+ ${GTK_INSTALL_VERSION} .$\r GTK+ ${GTK_MIN_VERSION} , ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE ".Pidgin "
--- a/pidgin/win32/nsis/translations/hungarian.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/hungarian.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -32,7 +32,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Egy rgi verzij GTK+ futtatkrnyezet van teleptve. Kvnja frissteni?$\rMegjegyzs: a Pidgin nem fog mkdni, ha nem frissti." -!define GTK_WINDOWS_INCOMPATIBLE "A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy jabb vltozatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem kerl teleptsre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy jabb mg nincs teleptve, akkor a telepts most megszakad." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "A Windows Pidgin weboldalnak felkeresse"
--- a/pidgin/win32/nsis/translations/italian.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/italian.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -32,7 +32,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT " stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento." -!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me non incompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sar installato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo gi installato sul tuo computer, questa installazione sar interrotta." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visita la pagina web di Pidgin"
--- a/pidgin/win32/nsis/translations/lithuanian.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/lithuanian.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -30,7 +30,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j atnaujinti?$\rPastaba: $(^Name) gali neveikti, jeigu to nepadarysite." -!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me yra nesuderinami su GTK+ 2.8.0 ir naujesnmis versijomis. GTK+ ${GTK_INSTALL_VERSION} nebus diegta.$\rJeigu neturite sidieg GTK+ ${GTK_MIN_VERSION} ar naujesns versijos, diegimas dabar bus nutrauktas." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Aplankyti Pidgin tinklalap"
--- a/pidgin/win32/nsis/translations/persian.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/persian.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -34,7 +34,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT " GTK+ . Ͽ$\r: $(^Name) ." -!define GTK_WINDOWS_INCOMPATIBLE " 95/98/Me GTK+ 2.8.0 Ґ . GTK+ ${GTK_INSTALL_VERSION} .$\r ǐ GTK+ ${GTK_MIN_VERSION} ϡ ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " "
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/portuguese-br.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -44,7 +44,6 @@ !define INSTALLER_IS_RUNNING "O instalador j est em execuo." !define PIDGIN_IS_RUNNING "Uma instncia do Pidgin est em execuo. Feche o Pidgin e tente novamente." -!define GTK_WINDOWS_INCOMPATIBLE "O Windows 95/98/Me incompatvel com o GTK+ 2.8.0 ou superior. O GTK+ ${GTK_INSTALL_VERSION} no ser instalado.$\rSe voc no possuir o GTK+ verso ${GTK_MIN_VERSION} ou superior j instalado, o instalador ir fechar agora." !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "No foi possvel desinstalar a verso do Pidgin que est instalada atualmente. A nova verso ser instalada sem que a verso antiga seja removida." !define URI_HANDLERS_SECTION_TITLE "Handlers para endereos" !define PIDGIN_SPELLCHECK_SECTION_TITLE "Suporte a verificao ortogrfica"
--- a/pidgin/win32/nsis/translations/slovenian.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/slovenian.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -32,7 +32,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Nameeno imate starejo razliico izvajalnega okolja GTK+. Jo elite nadgraditi?$\rOpomba: e je ne boste nadgradili, $(^Name) morda ne bo deloval." -!define GTK_WINDOWS_INCOMPATIBLE "Okolja Windows 95/98/Me z GTK+ 2.8.0 ali novejimi niso zdruljiva. GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} ali noveji je e nameen, zato se bo namestitev zdaj prekinila." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Obiite spletno stran Windows Pidgin"
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/nsis/translations/trad-chinese.nsh Sat Oct 03 21:31:14 2009 +0000 @@ -34,7 +34,6 @@ ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "o{@ª GTK+ ҡCznNɯŶܡH$\rЪ`NGpGzɯšA $(^Name) iLkTQC" -!define GTK_WINDOWS_INCOMPATIBLE "۪ 2.8.0 }lAGTK P Windows 95/98/Me wAۮeAGTK+ ${GTK_INSTALL_VERSION} ]N|QwˡC$\rpGtΤwgw˪ GTK+ ${GTK_MIN_VERSION} ΧsAw˵{NHYC" ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "X Windows Pidgin "
--- a/pidgin/win32/untar.c Sat Oct 03 21:30:52 2009 +0000 +++ b/pidgin/win32/untar.c Sat Oct 03 21:31:14 2009 +0000 @@ -80,14 +80,7 @@ #include "untar.h" #include <glib.h> -#if GLIB_CHECK_VERSION(2,6,0) -# include <glib/gstdio.h> -#else -#define mkdir(a,b) _mkdir((a)) -#define g_mkdir mkdir -#define g_fopen fopen -#define g_unlink unlink -#endif +#include <glib/gstdio.h> #define untar_error( error, args... ) purple_debug(PURPLE_DEBUG_ERROR, "untar", error, ## args ) #define untar_warning( warning, args... ) purple_debug(PURPLE_DEBUG_WARNING, "untar", warning, ## args )
--- a/po/ChangeLog Sat Oct 03 21:30:52 2009 +0000 +++ b/po/ChangeLog Sat Oct 03 21:31:14 2009 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.0 + version 2.6.2 * Afrikaans translation updated (Friedel Wolff) * Albanian translation updated (Besnik Bleta)