Commit 057942d8 authored by OlivierDuchateau's avatar OlivierDuchateau Committed by Simon Steinbeiss
Browse files

Fix GTimeVal deprecation (Bug #16805)

parent d8040809

panel-plugin/notification-plugin-log.c

+4 −7
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ notification_plugin_menu_populate (NotificationPlugin *notification_plugin) 
      gchar *app_name;

      gchar *tooltip_timestamp = NULL;

      gchar *tmp;

      GTimeVal tv;

      GDateTime *log_timestamp;



      /* optionally only show notifications from today */
@@ -211,13 +210,11 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS 
      mi = gtk_image_menu_item_new ();

G_GNUC_END_IGNORE_DEPRECATIONS



      if (g_time_val_from_iso8601 (group, &tv) == TRUE) {

        log_timestamp = g_date_time_new_from_timeval_local (&tv);

      log_timestamp = g_date_time_new_from_iso8601 (group, NULL);

      if (log_timestamp != NULL) {

        tooltip_timestamp = g_date_time_format (log_timestamp, "%c");

        g_date_time_unref (log_timestamp);

      }

      }



      app_name = g_key_file_get_string (notify_log, group, "app_name", NULL);

xfce4-notifyd-config/main.c

+5 −7
Original line number Diff line number Diff line
@@ -573,16 +573,14 @@ xfce4_notifyd_log_populate (NotificationLogWidgets *log_widgets) 
            gchar *app_name;

            gchar *tooltip_timestamp = NULL;

            gchar *tmp;

            GTimeVal tv;

            GDateTime *log_timestamp;



            if (g_time_val_from_iso8601 (group, &tv) == TRUE) {

                log_timestamp = g_date_time_new_from_timeval_local (&tv);

            log_timestamp = g_date_time_new_from_iso8601 (group, NULL);

            if (log_timestamp != NULL) {

                    tooltip_timestamp = g_date_time_format (log_timestamp, "%c");

                tooltip_timestamp = g_date_time_format (log_timestamp,

                                                        "%c");

                g_date_time_unref (log_timestamp);

            }

            }



            if (g_ascii_strncasecmp (timestamp, group, 10) == 0 && yesterday == FALSE) {

                GtkWidget *header;

xfce4-notifyd/xfce-notify-window.c

+3 −3
Original line number Diff line number Diff line
@@ -305,11 +305,11 @@ static void 
xfce_notify_window_start_expiration(XfceNotifyWindow *window)

{

    if(window->expire_timeout) {

        GTimeVal ct;

        gint64 ct;

        guint timeout;

        gboolean fade_transparent;



        g_get_current_time(&ct);

        ct = g_get_real_time();



        fade_transparent =

            gdk_screen_is_composited(gtk_window_get_screen(GTK_WINDOW (window)));
@@ -321,7 +321,7 @@ xfce_notify_window_start_expiration(XfceNotifyWindow *window) 
        else

            timeout = FADE_TIME;



        window->expire_start_timestamp = ct.tv_sec * 1000 + ct.tv_usec / 1000;

        window->expire_start_timestamp = ct / 1000;

        window->expire_id = g_timeout_add(timeout,

                                          xfce_notify_window_expire_timeout,

                                          window);