diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-06-18 21:37:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-06-18 21:37:42 +0000 |
| commit | 841a29837e5929bd07a45081e5eec43c1bc910f5 (patch) | |
| tree | 79549dd74e4a705b0a5baa112bedf1d2791473d3 /gdk | |
| parent | 7554384b2d476e1968dcb3d898c7024c148734de (diff) | |
| parent | 0db6ee9347a5fa5cab999298c8631bc71e8b5dee (diff) | |
| download | gtk+-841a29837e5929bd07a45081e5eec43c1bc910f5.tar.gz | |
Merge branch 'lrn/misc-gtk4-fixes' into 'master'
Misc GTK4 fixes
See merge request GNOME/gtk!195
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkcontentserializer.c | 4 | ||||
| -rw-r--r-- | gdk/win32/gdksurface-win32.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c index 92cbb2df6b..7b99690224 100644 --- a/gdk/gdkcontentserializer.c +++ b/gdk/gdkcontentserializer.c @@ -895,8 +895,8 @@ init (void) gdk_content_register_serializer (G_TYPE_STRING, mime, string_serializer, - mime, - g_free); + (gpointer) charset, + NULL); } gdk_content_register_serializer (G_TYPE_STRING, "text/plain", diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 8b3cfa15bd..932ca4a663 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -401,7 +401,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint) wcl.lpfnWndProc = _gdk_win32_surface_procedure; wcl.cbClsExtra = 0; wcl.cbWndExtra = 0; - wcl.hInstance = _gdk_app_hmodule; + wcl.hInstance = _gdk_dll_hinstance; wcl.hIcon = 0; wcl.hIconSm = 0; @@ -410,7 +410,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint) { gchar sLoc [MAX_PATH+1]; - if (0 != GetModuleFileName (_gdk_app_hmodule, sLoc, MAX_PATH)) + if (0 != GetModuleFileName (_gdk_dll_hinstance, sLoc, MAX_PATH)) { ExtractIconEx (sLoc, 0, &hAppIcon, &hAppIconSm, 1); @@ -682,7 +682,7 @@ _gdk_win32_display_create_surface_impl (GdkDisplay *display, window_width, window_height, hparent, NULL, - _gdk_app_hmodule, + _gdk_dll_hinstance, window); if (GDK_SURFACE_HWND (window) != hwndNew) { @@ -2158,9 +2158,7 @@ gdk_win32_surface_set_icon_list (GdkSurface *window, /* Create the icons */ big_hicon = _gdk_win32_texture_to_hicon (big_texture); - g_object_unref (big_texture); small_hicon = _gdk_win32_texture_to_hicon (small_texture); - g_object_unref (small_texture); /* Set the icons */ SendMessageW (GDK_SURFACE_HWND (window), WM_SETICON, ICON_BIG, @@ -3176,7 +3174,7 @@ RegisterGdkDumbClass () wcl.lpfnWndProc = DefWindowProcW; wcl.cbClsExtra = 0; wcl.cbWndExtra = 0; - wcl.hInstance = _gdk_app_hmodule; + wcl.hInstance = _gdk_dll_hinstance; wcl.hIcon = 0; wcl.hIconSm = 0; wcl.lpszMenuName = NULL; @@ -3217,7 +3215,7 @@ ensure_snap_indicator_exists (GdkW32DragMoveResizeContext *context) 0, 0, NULL, NULL, - _gdk_app_hmodule, + _gdk_dll_hinstance, NULL); context->shape_indicator = handle; |