glib2-wncksync-patch/gio-wncksync.patch

   1 *** gio/gdesktopappinfo.c       2009-10-16 23:57:29.436561111 -0400
   2 --- gio/gdesktopappinfo.c       2009-10-17 00:06:28.716984254 -0400
   3 ***************
   4 *** 69,74 ****
   5 --- 69,78 ----
   6   static void     mime_info_cache_reload                (const char       *dir);
   7   static gboolean g_desktop_app_info_ensure_saved       (GDesktopAppInfo  *info,
   8                                                        GError          **error);
   9 + static void
  10 + g_desktop_app_info_launch_handler_on_launched (GDesktopAppInfoLaunchHandler *launch_handler,
  11 +                                                const char                   *desktop_file_path,
  12 +                                                gint                         pid);
  13
  14   /**
  15    * GDesktopAppInfo:
  16 ***************
  17 *** 859,864 ****
  18 --- 863,907 ----
  19       g_setenv ("DESKTOP_STARTUP_ID", data->sn_id, TRUE);
  20   }
  21
  22 + static void
  23 + g_desktop_app_info_on_launched (const char *desktop_file_path, gint pid)
  24 + {
  25 +   static gsize lookup = 0;
  26 +
  27 +   if (g_once_init_enter (&lookup))
  28 +     {
  29 +       gsize setup_value = 1;
  30 +       GDesktopAppInfoLaunchHandler *lookup_instance;
  31 +       GIOExtensionPoint *ep;
  32 +       GIOExtension *extension;
  33 +       GList *l;
  34 +
  35 +       /* Ensure vfs in modules loaded */
  36 +       _g_io_modules_ensure_loaded ();
  37 +
  38 +       ep = g_io_extension_point_lookup (G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME);
  39 +
  40 +       lookup_instance = NULL;
  41 +       for (l = g_io_extension_point_get_extensions (ep); l != NULL; l = l->next)
  42 +         {
  43 +           extension = l->data;
  44 +           lookup_instance = g_object_new (g_io_extension_get_type (extension), NULL);
  45 +           if (lookup_instance != NULL)
  46 +             break;
  47 +       }
  48 +
  49 +       if (lookup_instance != NULL)
  50 +       setup_value = (gsize)lookup_instance;
  51 +
  52 +       g_once_init_leave (&lookup, setup_value);
  53 +     }
  54 +
  55 +   if (lookup == 1)
  56 +     return;
  57 +
  58 +   g_desktop_app_info_launch_handler_on_launched (G_DESKTOP_APP_INFO_LAUNCH_HANDLER (lookup), desktop_file_path, pid);
  59 + }
  60 +
  61   static gboolean
  62   g_desktop_app_info_launch_uris (GAppInfo           *appinfo,
  63                                 GList              *uris,
  64 ***************
  65 *** 910,922 ****
  66           g_list_free (launched_files);
  67         }
  68
  69         if (!g_spawn_async (info->path,
  70                           argv,
  71                           NULL,
  72                           G_SPAWN_SEARCH_PATH,
  73                           child_setup,
  74                           &data,
  75 !                         NULL,
  76                           error))
  77         {
  78           if (data.sn_id)
  79 --- 953,966 ----
  80           g_list_free (launched_files);
  81         }
  82
  83 +       gint pid;
  84         if (!g_spawn_async (info->path,
  85                           argv,
  86                           NULL,
  87                           G_SPAWN_SEARCH_PATH,
  88                           child_setup,
  89                           &data,
  90 !                         &pid,
  91                           error))
  92         {
  93           if (data.sn_id)
  94 ***************
  95 *** 927,932 ****
  96 --- 971,980 ----
  97
  98           goto out;
  99         }
 100 +       else
 101 +         {
 102 +           g_desktop_app_info_on_launched (info->filename, pid);
 103 +         }
 104
 105         g_free (data.sn_id);
 106         g_free (data.display);
 107 ***************
 108 *** 2692,2696 ****
 109 --- 2740,2806 ----
 110     return (* iface->get_default_for_uri_scheme) (lookup, uri_scheme);
 111   }
 112
 113 + /* GDesktopAppInfoLaunchHandler interface: */
 114 +
 115 + static void g_desktop_app_info_launch_handler_base_init (gpointer g_class);
 116 + static void g_desktop_app_info_launch_handler_class_init (gpointer g_class,
 117 +                                                 gpointer class_data);
 118 +
 119 + GType
 120 + g_desktop_app_info_launch_handler_get_type (void)
 121 + {
 122 +   static volatile gsize g_define_type_id__volatile = 0;
 123 +
 124 +   if (g_once_init_enter (&g_define_type_id__volatile))
 125 +     {
 126 +       const GTypeInfo desktop_app_info_launch_handler_info =
 127 +       {
 128 +         sizeof (GDesktopAppInfoLaunchHandlerIface), /* class_size */
 129 +       g_desktop_app_info_launch_handler_base_init,   /* base_init */
 130 +       NULL,           /* base_finalize */
 131 +       g_desktop_app_info_launch_handler_class_init,
 132 +       NULL,           /* class_finalize */
 133 +       NULL,           /* class_data */
 134 +       0,
 135 +       0,              /* n_preallocs */
 136 +       NULL
 137 +       };
 138 +       GType g_define_type_id =
 139 +       g_type_register_static (G_TYPE_INTERFACE, I_("GDesktopAppInfoLaunchHandler"),
 140 +                       &desktop_app_info_launch_handler_info, 0);
 141 +
 142 +       g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_OBJECT);
 143 +
 144 +       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
 145 +     }
 146 +
 147 +   return g_define_type_id__volatile;
 148 + }
 149 +
 150 + static void
 151 + g_desktop_app_info_launch_handler_class_init (gpointer g_class,
 152 +                                     gpointer class_data)
 153 + {
 154 + }
 155 +
 156 + static void
 157 + g_desktop_app_info_launch_handler_base_init (gpointer g_class)
 158 + {
 159 + }
 160 +
 161 + static void
 162 + g_desktop_app_info_launch_handler_on_launched (GDesktopAppInfoLaunchHandler *launch_handler,
 163 +                                                const char                   *desktop_file_path,
 164 +                                                gint                         pid)
 165 + {
 166 +   GDesktopAppInfoLaunchHandlerIface *iface;
 167 +
 168 +   g_return_if_fail (G_IS_DESKTOP_APP_INFO_LAUNCH_HANDLER (launch_handler));
 169 +
 170 +   iface = G_DESKTOP_APP_INFO_LAUNCH_HANDLER_GET_IFACE (launch_handler);
 171 +
 172 +   (* iface->on_launched) (launch_handler, desktop_file_path, pid);
 173 + }
 174 +
 175   #define __G_DESKTOP_APP_INFO_C__
 176   #include "gioaliasdef.c"
 177
 178 *** gio/gdesktopappinfo.h       2009-03-31 19:04:20.000000000 -0400
 179 --- gio/gdesktopappinfo.h       2009-07-21 20:34:35.565657314 -0400
 180 ***************
 181 *** 89,94 ****
 182 --- 89,123 ----
 183   GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
 184                                                                   const char            *uri_scheme);
 185
 186 +
 187 +
 188 + #define G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER           (g_desktop_app_info_launch_handler_get_type ())
 189 + #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER, GDesktopAppInfoLaunchHandler))
 190 + #define G_IS_DESKTOP_APP_INFO_LAUNCH_HANDLER(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER))
 191 + #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER, GDesktopAppInfoLaunchHandlerIface))
 192 +
 193 + /**
 194 +  * G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME:
 195 +  *
 196 +  * Extension point for default handler to launching. See
 197 +  * <link linkend="extending-gio">Extending GIO</link>.
 198 +  */
 199 + #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME "gio-desktop-app-info-launch-handler"
 200 +
 201 + typedef struct _GDesktopAppInfoLaunchHandler GDesktopAppInfoLaunchHandler;
 202 + typedef struct _GDesktopAppInfoLaunchHandlerIface GDesktopAppInfoLaunchHandlerIface;
 203 +
 204 + struct _GDesktopAppInfoLaunchHandlerIface
 205 + {
 206 +   GTypeInterface g_iface;
 207 +
 208 +   void (* on_launched) (GDesktopAppInfoLaunchHandler *launch_handler,
 209 +                         const char                   *desktop_file_path,
 210 +                         gint                         pid);
 211 + };
 212 +
 213 + GType     g_desktop_app_info_launch_handler_get_type                   (void) G_GNUC_CONST;
 214 +
 215   G_END_DECLS
 216
 217   #endif /* __G_DESKTOP_APP_INFO_H__ */
 218
 219 *** gio/giomodule.c     2009-03-31 19:04:20.000000000 -0400
 220 --- gio/giomodule.c     2009-07-21 20:40:32.738157079 -0400
 221 ***************
 222 *** 312,317 ****
 223 --- 312,320 ----
 224   #ifdef G_OS_UNIX
 225         ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
 226         g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
 227 +
 228 +       ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME);
 229 +       g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER);
 230   #endif
 231
 232         ep = g_io_extension_point_register (G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME);
 233