From: Carlos Garcia Campos Date: Sat, 26 Jan 2008 16:31:10 +0000 (+0000) Subject: Removed X-Git-Tag: EVINCE_2_21_90~11 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=bcaa521f593f12d497df457701ced61e5297573c;p=evince.git Removed 2008-01-26 Carlos Garcia Campos * cut-n-paste/totem-screensaver/totem-scrsaver.c: (screensaver_disable_x11): * shell/Makefile.am: * shell/xdg-user-dir-lookup.c: Removed * shell/ev-metadata-manager.c: (ev_metadata_arm_timeout): * shell/ev-view.c: (ev_view_presentation_transition_start): * shell/ev-window.c: (ev_window_cmd_file_open), (ev_window_cmd_save_as), (presentation_set_timeout): Remove #ifdefs that are no longer needed. svn path=/trunk/; revision=2861 --- diff --git a/ChangeLog b/ChangeLog index 4fe67cf1..e7d5c298 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-01-26 Carlos Garcia Campos + + * cut-n-paste/totem-screensaver/totem-scrsaver.c: + (screensaver_disable_x11): + * shell/Makefile.am: + * shell/xdg-user-dir-lookup.c: Removed + * shell/ev-metadata-manager.c: (ev_metadata_arm_timeout): + * shell/ev-view.c: (ev_view_presentation_transition_start): + * shell/ev-window.c: (ev_window_cmd_file_open), + (ev_window_cmd_save_as), (presentation_set_timeout): + + Remove #ifdefs that are no longer needed. + 2008-01-26 Carlos Garcia Campos * shell/ev-view.[ch]: (ev_view_button_release_event), diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c index 39244304..c7011cf1 100644 --- a/cut-n-paste/totem-screensaver/totem-scrsaver.c +++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c @@ -294,21 +294,11 @@ screensaver_disable_x11 (TotemScrsaver *scr) if (scr->priv->timeout != 0) { -#if GLIB_CHECK_VERSION (2, 13, 0) g_timeout_add_seconds (scr->priv->timeout / 2, (GSourceFunc) fake_event, scr); -#else - g_timeout_add (scr->priv->timeout / 2 * 1000, - (GSourceFunc) fake_event, scr); -#endif } else { -#if GLIB_CHECK_VERSION (2, 13, 0) g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2, (GSourceFunc) fake_event, scr); -#else - g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000, - (GSourceFunc) fake_event, scr); -#endif } return; diff --git a/shell/Makefile.am b/shell/Makefile.am index 3e42aff5..b5883ed1 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -85,9 +85,7 @@ evince_SOURCES= \ ev-tooltip.h \ ev-transition-animation.c \ ev-transition-animation.h \ - main.c \ - xdg-user-dir-lookup.c - + main.c if WITH_GNOME_PRINT evince_SOURCES+= \ diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index a583f3c2..ce164ad5 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -96,21 +96,13 @@ ev_metadata_arm_timeout(void) { if (ev_metadata_manager->timeout_id) return; -#if GLIB_CHECK_VERSION (2, 13, 5) + ev_metadata_manager->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE, 2, (GSourceFunc)ev_metadata_manager_save, NULL, NULL); -#else - ev_metadata_manager->timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, - 2000, /* 2 sec */ - (GSourceFunc)ev_metadata_manager_save, - NULL, - NULL); -#endif } /** diff --git a/shell/ev-view.c b/shell/ev-view.c index fa9fbd8d..dc1d190f 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -4759,17 +4759,10 @@ ev_view_presentation_transition_start (EvView *view) duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document), view->current_page); if (duration > 0) { -#if GLIB_CHECK_VERSION (2, 13, 0) view->trans_timeout_id = g_timeout_add_seconds (duration, (GSourceFunc) transition_next_page, view); -#else - view->trans_timeout_id = - g_timeout_add (duration * 1000, - (GSourceFunc) transition_next_page, - view); -#endif } } diff --git a/shell/ev-window.c b/shell/ev-window.c index f15e06fc..b44b3384 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -91,10 +91,6 @@ #include #include -#if !GLIB_CHECK_VERSION (2, 13, 3) -char *xdg_user_dir_lookup (char *type); -#endif - typedef enum { PAGE_MODE_DOCUMENT, PAGE_MODE_PASSWORD @@ -1595,20 +1591,11 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser), window->priv->uri); } else { -#if GLIB_CHECK_VERSION (2, 13, 3) const gchar *folder; folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder ? folder : g_get_home_dir ()); -#else - char *folder; - - folder = xdg_user_dir_lookup ("DOCUMENTS"); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), - folder); - free (folder); -#endif } g_signal_connect (chooser, "response", @@ -2012,11 +1999,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) GtkWidget *fc; gchar *base_name; GFile *file; -#if GLIB_CHECK_VERSION (2, 13, 3) const gchar *folder; -#else - gchar *folder; -#endif fc = gtk_file_chooser_dialog_new ( _("Save a Copy"), @@ -2034,15 +2017,9 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) base_name = g_file_get_basename (file); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name); -#if GLIB_CHECK_VERSION (2, 13, 3) folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder ? folder : g_get_home_dir ()); -#else - folder = xdg_user_dir_lookup ("DOCUMENTS"); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder); - free (folder); -#endif g_object_unref (file); g_free (base_name); @@ -2924,15 +2901,9 @@ presentation_set_timeout (EvWindow *window) g_source_remove (window->priv->presentation_timeout_id); } -#if GLIB_CHECK_VERSION (2, 13, 0) window->priv->presentation_timeout_id = g_timeout_add_seconds (PRESENTATION_TIMEOUT, (GSourceFunc)presentation_timeout_cb, window); -#else - window->priv->presentation_timeout_id = - g_timeout_add (PRESENTATION_TIMEOUT * 1000, - (GSourceFunc)presentation_timeout_cb, window); -#endif ev_view_show_cursor (EV_VIEW (window->priv->view)); } diff --git a/shell/xdg-user-dir-lookup.c b/shell/xdg-user-dir-lookup.c deleted file mode 100644 index 669fe2f0..00000000 --- a/shell/xdg-user-dir-lookup.c +++ /dev/null @@ -1,152 +0,0 @@ -/* - This file is not licenced under the GPL like the rest of the code. - Its is under the MIT license, to encourage reuse by cut-and-paste. - - Copyright (c) 2007 Red Hat, inc - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#include -#include -#include -#include - - -char * -xdg_user_dir_lookup (const char *type) -{ - FILE *file; - char *home_dir, *config_home, *config_file; - char buffer[512]; - char *user_dir; - char *p, *d; - int len; - int relative; - - home_dir = getenv ("HOME"); - - if (home_dir == NULL) - return strdup ("/tmp"); - - config_home = getenv ("XDG_CONFIG_HOME"); - if (config_home == NULL || config_home[0] == 0) - { - config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1); - strcpy (config_file, home_dir); - strcat (config_file, "/.config/user-dirs.dirs"); - } - else - { - config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1); - strcpy (config_file, config_home); - strcat (config_file, "/user-dirs.dirs"); - } - - file = fopen (config_file, "r"); - free (config_file); - if (file == NULL) - goto error; - - user_dir = NULL; - while (fgets (buffer, sizeof (buffer), file)) - { - /* Remove newline at end */ - len = strlen (buffer); - if (len > 0 && buffer[len-1] == '\n') - buffer[len-1] = 0; - - p = buffer; - while (*p == ' ' || *p == '\t') - p++; - - if (strncmp (p, "XDG_", 4) != 0) - continue; - p += 4; - if (strncmp (p, type, strlen (type)) != 0) - continue; - p += strlen (type); - if (strncmp (p, "_DIR", 4) != 0) - continue; - p += 4; - - while (*p == ' ' || *p == '\t') - p++; - - if (*p != '=') - continue; - p++; - - while (*p == ' ' || *p == '\t') - p++; - - if (*p != '"') - continue; - p++; - - relative = 0; - if (strncmp (p, "$HOME/", 6) == 0) - { - p += 6; - relative = 1; - } - else if (*p != '/') - continue; - - if (relative) - { - user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1); - strcpy (user_dir, home_dir); - strcat (user_dir, "/"); - } - else - { - user_dir = malloc (strlen (p) + 1); - *user_dir = 0; - } - - d = user_dir + strlen (user_dir); - while (*p && *p != '"') - { - if ((*p == '\\') && (*(p+1) != 0)) - p++; - *d++ = *p++; - } - *d = 0; - } - fclose (file); - - if (user_dir) - return user_dir; - - error: - /* Special case desktop for historical compatibility */ - if (strcmp (type, "DESKTOP") == 0) - { - user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1); - strcpy (user_dir, home_dir); - strcat (user_dir, "/Desktop"); - return user_dir; - } - else - return strdup (home_dir); -} -