[Xfce4-commits] [apps/ristretto] 01/01: Fix memory leaks in Privacy Dialog

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/ristretto.

commit f39e0cb8769c7a56a02b043e8664ea00eb9f61d5
Author: Igor <f2404 at yandex.ru>
Date:   Tue Oct 29 13:31:35 2019 -0400

    Fix memory leaks in Privacy Dialog
---
 src/main_window.c    |  5 +++--
 src/privacy_dialog.c | 27 ++++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main_window.c b/src/main_window.c
index fcf9616..7978f79 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -4470,15 +4470,16 @@ cb_rstto_main_window_clear_private_data (
 
     recent_filter = gtk_recent_filter_new();
     gtk_recent_filter_add_application (recent_filter, "ristretto");
-    gtk_recent_chooser_add_filter(GTK_RECENT_CHOOSER(dialog), recent_filter);
+    gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (dialog), recent_filter);
 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
-        uris = gtk_recent_chooser_get_uris (GTK_RECENT_CHOOSER(dialog), &n_uris);
+        uris = gtk_recent_chooser_get_uris (GTK_RECENT_CHOOSER (dialog), &n_uris);
         for (i = 0; i < n_uris; ++i)
         {
             gtk_recent_manager_remove_item (window->priv->recent_manager, uris[i], NULL);
         }
+        g_strfreev (uris);
     }
 
     gtk_widget_destroy (dialog);
diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c
index c82ea7f..2aa9daa 100644
--- a/src/privacy_dialog.c
+++ b/src/privacy_dialog.c
@@ -373,7 +373,7 @@ rstto_recent_chooser_get_items (
     GtkRecentFilterInfo filter_info;
     gsize n_applications;
 
-    g_list_foreach (items, (GFunc)gtk_recent_info_ref, NULL);
+    g_list_foreach (items, (GFunc) gtk_recent_info_ref, NULL);
 
     while (NULL != all_items_iter)
     {
@@ -381,11 +381,12 @@ rstto_recent_chooser_get_items (
 
         filter_info.contains = GTK_RECENT_FILTER_URI | GTK_RECENT_FILTER_APPLICATION;
         filter_info.uri = gtk_recent_info_get_uri (info);
-        filter_info.applications = (const gchar **)gtk_recent_info_get_applications (info, &n_applications);
-    
-        if (FALSE == gtk_recent_filter_filter(dialog->priv->timeframe_filter, &filter_info))
+        filter_info.applications = (const gchar **) gtk_recent_info_get_applications (info, &n_applications);
+
+        if (!gtk_recent_filter_filter (dialog->priv->timeframe_filter, &filter_info))
         {
             items = g_list_remove (items, info);
+            gtk_recent_info_unref (info);
         }
         else
         {
@@ -393,17 +394,18 @@ rstto_recent_chooser_get_items (
 
             while (NULL != filters)
             {
-                if (FALSE == gtk_recent_filter_filter(filters->data, &filter_info))
+                if (!gtk_recent_filter_filter (filters->data, &filter_info))
                 {
                     items = g_list_remove (items, info);
+                    gtk_recent_info_unref (info);
                     break;
                 }
-                
+
                 filters = g_slist_next (filters);
             }
         }
 
-        g_strfreev ((gchar **)filter_info.applications);
+        g_strfreev ((gchar **) filter_info.applications);
         all_items_iter = g_list_next (all_items_iter);
     }
 
@@ -456,12 +458,11 @@ cb_rstto_recent_filter_filter_timeframe(
 {
     RsttoPrivacyDialog *dialog = RSTTO_PRIVACY_DIALOG (user_data);
     GtkRecentInfo *info = gtk_recent_manager_lookup_item (dialog->priv->recent_manager, filter_info->uri, NULL);
- 
-    if ((dialog->priv->time_now - gtk_recent_info_get_visited (info)) < dialog->priv->time_offset)
-    {
-        return TRUE;
-    }
-    return FALSE;
+    const time_t visited = gtk_recent_info_get_visited (info);
+
+    gtk_recent_info_unref (info);
+
+    return (dialog->priv->time_now - visited) < dialog->priv->time_offset;
 }
 
 /********************/

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.