Fix build issues on MacOSX

This commit is contained in:
François Grisez 2015-04-27 17:51:12 +02:00
parent 70c42b9823
commit a188779a77
2 changed files with 6 additions and 2 deletions

View file

@ -1530,11 +1530,14 @@ static GtkWidget *create_icon_menu(){
return menu;
}
#ifndef HAVE_GTK_OSX
void linphone_gtk_save_main_window_position(GtkWindow* mw, GdkEvent *event, gpointer data){
gtk_window_get_position(GTK_WINDOW(mw), &main_window_x, &main_window_y);
}
#endif
static void handle_icon_click(LinphoneStatusIcon *si, void *user_data) {
#ifndef HAVE_GTK_OSX
GtkWidget *mw=linphone_gtk_get_main_window();
if (!gtk_window_is_active((GtkWindow*)mw)) {
if(!gtk_widget_is_drawable(mw)){
@ -1546,6 +1549,7 @@ static void handle_icon_click(LinphoneStatusIcon *si, void *user_data) {
linphone_gtk_save_main_window_position((GtkWindow*)mw, NULL, NULL);
gtk_widget_hide(mw);
}
#endif
}
static void linphone_gtk_status_icon_initialised_cb(LinphoneStatusIconParams *params) {

View file

@ -337,7 +337,7 @@ static const _LinphoneStatusIconDesc _linphone_status_icon_impl_gtk_desc = {
/* GtkosxApplication implementation */
#ifdef HAVE_GTK_OSX
static void _linphone_status_icon_impl_gtkosx_app_enable_blinking(StatusIcon *si, gboolean val) {
static void _linphone_status_icon_impl_gtkosx_app_enable_blinking(LinphoneStatusIcon *si, gboolean val) {
GtkosxApplication *theMacApp=gtkosx_application_get();
gint *attention_id = (gint *)&si->data;
if (val && *attention_id == 0) {
@ -364,7 +364,7 @@ static const _LinphoneStatusIconDesc _linphone_status_icon_impl_gtkosx_app_desc
.uninit = NULL,
.start = NULL,
.enable_blinking = _linphone_status_icon_impl_gtkosx_app_enable_blinking,
.is_supported = _linphone_satus_icon_impl_gtkosx_app_is_supported
.is_supported = _linphone_status_icon_impl_gtkosx_app_is_supported
};
#endif