pidgin/pidgin

[gaim-migrate @ 16001]

2006-04-10, Daniel Atallah
7cf0f845d2d6
Parents b3bf5932fddc
Children 983b0c58fcae
[gaim-migrate @ 16001]
Don't do gnome and kde checks in wingaim - g_find_program_in_path() is even more intensive in win32 than it is elsewhere and, in this case, completely unnecessary.
1 files changed, 8 insertions(+), 0 deletions(-)
  • +8 -0
    src/util.c
    • --- a/src/util.c Mon Apr 10 21:25:36 2006 +0000
    +++ b/src/util.c Mon Apr 10 22:07:19 2006 +0000
    @@ -2561,6 +2561,7 @@
    gboolean
    gaim_running_gnome(void)
    {
    +#ifndef _WIN32
    gchar *tmp = g_find_program_in_path("gnome-open");
    if (tmp == NULL)
    @@ -2568,11 +2569,15 @@
    g_free(tmp);
    return (g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL);
    +#else
    + return FALSE;
    +#endif
    }
    gboolean
    gaim_running_kde(void)
    {
    +#ifndef _WIN32
    gchar *tmp = g_find_program_in_path("kfmclient");
    const char *session;
    @@ -2589,6 +2594,9 @@
    * only a problem if you're running something !(KDE || GNOME) and
    * you run Gaim from Konsole. This really shouldn't be a problem. */
    return ((g_getenv("KDEDIR") != NULL) || g_getenv("KDEDIRS") != NULL);
    +#else
    + return FALSE;
    +#endif
    }
    char *