Refresh patch

fc0c6bcd · Iain Lane · ea1f576d · fc0c6bcd
Unverified Commit fc0c6bcd authored Apr 16, 2023 by Iain Lane
--- a/debian/patches/screencast-Duplicate-monitor-and-window-stream-info.patch
+++ b/debian/patches/screencast-Duplicate-monitor-and-window-stream-info.patch
@@ -9,7 +9,6 @@ and used to produce restore data.
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xdg-desktop-portal-gnome/+bug/2012341
 Bug-Upstream: https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/76
 Origin: upstream, commit:a46d3b338ed362e6dfad359db3d9a505bff0dc9c
-
 ---
 src/displaystatetracker.c | 15 ++++++++++++++-
 src/displaystatetracker.h |  4 ++++
@@ -69,10 +68,10 @@ index 1c3a7dc..e438dda 100644
 
 const char * monitor_get_match_string (Monitor *monitor);
 diff --git a/src/screencast.c b/src/screencast.c
-index 01b1ada..116b7f7 100644
+index e54bcd3..a16b8c3 100644
 --- a/src/screencast.c
 +++ b/src/screencast.c
-@@ -471,6 +471,24 @@ find_best_window_by_app_id_and_title (const char *app_id,
+@@ -472,6 +472,24 @@ find_best_window_by_app_id_and_title (const char *app_id,
   return best_match;
 }
 
@@ -97,7 +96,7 @@ index 01b1ada..116b7f7 100644
 static gboolean
 restore_stream_from_data (ScreenCastSession *screen_cast_session)
 
-@@ -488,7 +506,8 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
+@@ -489,7 +507,8 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
   if (!screen_cast_session->restored.data)
     return FALSE;
 
@@ -107,7 +106,7 @@ index 01b1ada..116b7f7 100644
 
   g_variant_get (screen_cast_session->restored.data,
                  RESTORE_VARIANT_TYPE,
-@@ -514,7 +533,7 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
+@@ -515,7 +534,7 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
 
             info = g_new0 (ScreenCastStreamInfo, 1);
             info->type = SCREEN_CAST_SOURCE_TYPE_MONITOR;
@@ -116,7 +115,7 @@ index 01b1ada..116b7f7 100644
             info->id = id;
             g_ptr_array_add (streams, info);
           }
-@@ -539,7 +558,7 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
+@@ -540,7 +559,7 @@ restore_stream_from_data (ScreenCastSession *screen_cast_session)
 
             info = g_new0 (ScreenCastStreamInfo, 1);
             info->type = SCREEN_CAST_SOURCE_TYPE_WINDOW;
@@ -136,7 +135,7 @@ index d50340c..bffd9a9 100644
 +
 +void screen_cast_stream_info_free (ScreenCastStreamInfo *info);
 diff --git a/src/screencastwidget.c b/src/screencastwidget.c
-index 86a4296..7ced4c3 100644
+index 339a9f3..d84a0da 100644
 --- a/src/screencastwidget.c
 +++ b/src/screencastwidget.c
 @@ -101,9 +101,10 @@ create_window_widget (Window *window)
@@ -169,7 +168,7 @@ index 86a4296..7ced4c3 100644
 
       g_string_append (string, monitor_get_display_name (monitor));
 
-@@ -594,7 +598,8 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
+@@ -599,7 +603,8 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
   uint32_t id = 0;
   GList *l;
 
@@ -179,7 +178,7 @@ index 86a4296..7ced4c3 100644
 
   selected_monitor_rows =
     gtk_list_box_get_selected_rows (GTK_LIST_BOX (self->monitor_list));
-@@ -615,7 +620,7 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
+@@ -620,7 +625,7 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
         {
           info = g_new0 (ScreenCastStreamInfo, 1);
           info->type = SCREEN_CAST_SOURCE_TYPE_MONITOR;
@@ -188,7 +187,7 @@ index 86a4296..7ced4c3 100644
           info->id = id++;
           g_ptr_array_add (streams, info);
         }
-@@ -636,7 +641,7 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
+@@ -641,7 +646,7 @@ screen_cast_widget_get_selected_streams (ScreenCastWidget *self)
 
       info = g_new0 (ScreenCastStreamInfo, 1);
       info->type = SCREEN_CAST_SOURCE_TYPE_WINDOW;
@@ -198,10 +197,10 @@ index 86a4296..7ced4c3 100644
       g_ptr_array_add (streams, info);
     }
 diff --git a/src/shellintrospect.c b/src/shellintrospect.c
-index c2b288d..bd816f8 100644
+index 6b007b4..d6352a7 100644
 --- a/src/shellintrospect.c
 +++ b/src/shellintrospect.c
-@@ -62,7 +62,7 @@ static guint signals[N_SIGNALS];
+@@ -62,7 +62,7 @@ G_DEFINE_TYPE (ShellIntrospect, shell_introspect, G_TYPE_OBJECT)
 
 static ShellIntrospect *_shell_introspect;
 
@@ -210,8 +209,8 @@ index c2b288d..bd816f8 100644
 window_free (Window *window)
 {
   g_free (window->title);
-@@ -70,6 +70,19 @@ window_free (Window *window)
-   g_free (window);
+@@ -88,6 +88,19 @@ window_get_id (Window *window)
+   return window->id;
 }
 
 +Window *
@@ -231,12 +230,12 @@ index c2b288d..bd816f8 100644
 get_windows_cb (GObject *source_object,
                 GAsyncResult *res,
 diff --git a/src/shellintrospect.h b/src/shellintrospect.h
-index f63ecee..ea4188f 100644
+index b187c4d..f5333b0 100644
 --- a/src/shellintrospect.h
 +++ b/src/shellintrospect.h
-@@ -34,6 +34,10 @@ void shell_introspect_ref_listeners (ShellIntrospect *shell_introspect);
- 
- void shell_introspect_unref_listeners (ShellIntrospect *shell_introspect);
+@@ -28,6 +28,10 @@ typedef struct _Window Window;
+ G_DECLARE_FINAL_TYPE (ShellIntrospect, shell_introspect,
+                       SHELL, INTROSPECT, GObject)
 
 +void window_free (Window *window);
 +