Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
a8ebf14d
Commit
a8ebf14d
authored
Mar 30, 2015
by
Ghislain MARY
Browse files
Fix icon size in the volume control on Windows.
parent
3242510e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
gtk/main.c
gtk/main.c
+11
-1
gtk/videowindow.c
gtk/videowindow.c
+0
-5
No files found.
gtk/main.c
View file @
a8ebf14d
...
...
@@ -343,8 +343,18 @@ static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name)
if
(
icon_path
)
{
GdkPixbuf
*
pbuf
=
create_pixbuf
(
icon_path
);
if
(
pbuf
!=
NULL
)
{
gtk_window_set_icon
(
GTK_WINDOW
(
w
),
pbuf
);
GList
*
pbuf_list
=
NULL
;
GdkPixbuf
*
pbuf_16
=
gdk_pixbuf_scale_simple
(
pbuf
,
16
,
16
,
GDK_INTERP_BILINEAR
);
GdkPixbuf
*
pbuf_32
=
gdk_pixbuf_scale_simple
(
pbuf
,
32
,
32
,
GDK_INTERP_BILINEAR
);
pbuf_list
=
g_list_append
(
pbuf_list
,
pbuf
);
pbuf_list
=
g_list_append
(
pbuf_list
,
pbuf_16
);
pbuf_list
=
g_list_append
(
pbuf_list
,
pbuf_32
);
gtk_window_set_icon_list
(
GTK_WINDOW
(
w
),
pbuf_list
);
gtk_window_set_default_icon_list
(
pbuf_list
);
g_object_unref
(
G_OBJECT
(
pbuf_16
));
g_object_unref
(
G_OBJECT
(
pbuf_32
));
g_object_unref
(
G_OBJECT
(
pbuf
));
g_list_free
(
pbuf_list
);
}
}
}
...
...
gtk/videowindow.c
View file @
a8ebf14d
...
...
@@ -257,8 +257,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){
char
*
remote
,
*
title
;
GtkWidget
*
video_window
;
const
LinphoneAddress
*
addr
;
const
char
*
icon_path
=
linphone_gtk_get_ui_config
(
"icon"
,
LINPHONE_ICON
);
GdkPixbuf
*
pbuf
=
create_pixbuf
(
icon_path
);
guint
timeout
;
MSVideoSize
vsize
=
{
MS_VIDEO_SIZE_CIF_W
,
MS_VIDEO_SIZE_CIF_H
};
GdkColor
color
;
...
...
@@ -270,9 +268,6 @@ static GtkWidget *create_video_window(LinphoneCall *call){
ms_free
(
remote
);
gtk_window_set_title
(
GTK_WINDOW
(
video_window
),
title
);
g_free
(
title
);
if
(
pbuf
){
gtk_window_set_icon
(
GTK_WINDOW
(
video_window
),
pbuf
);
}
gtk_window_resize
(
GTK_WINDOW
(
video_window
),
vsize
.
width
,
vsize
.
height
);
gdk_color_parse
(
"black"
,
&
color
);
gtk_widget_modify_bg
(
video_window
,
GTK_STATE_NORMAL
,
&
color
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment