Skip to content
This repository
Browse code

Use G_CALLBACK for porting to gtk3

  • Loading branch information...
commit 5548adc0b1a67596f2dbbaa32ebf067ff30ea6bf 1 parent d6c30de
thynson authored

Showing 1 changed file with 9 additions and 9 deletions. Show diff stats Hide diff stats

  1. +9 9 src/gui/facepopupwindow.c
18 src/gui/facepopupwindow.c
@@ -116,7 +116,7 @@ static void qq_face_popup_window_init(QQFacePopupWindow *win)
116 116 gtk_window_set_skip_taskbar_hint(GTK_WINDOW(win), TRUE);
117 117
118 118 g_signal_connect(win, "focus-out-event"
119   - , GTK_SIGNAL_FUNC(qq_face_popup_window_focus_out), win);
  119 + , G_CALLBACK(qq_face_popup_window_focus_out), win);
120 120
121 121 GtkWidget *table, *img, *eventbox, *frame;
122 122 gint i, j, k;
@@ -136,16 +136,16 @@ static void qq_face_popup_window_init(QQFacePopupWindow *win)
136 136 par -> face = face_transfer_table[k];
137 137 par -> win = GTK_WIDGET(win);
138 138 ++k;
139   - g_signal_connect(eventbox , "button-release-event"
140   - , GTK_SIGNAL_FUNC(face_popup_window_clicked)
  139 + g_signal_connect(eventbox , "button-release-event"
  140 + , G_CALLBACK(face_popup_window_clicked)
141 141 , par);
142 142 frame = gtk_frame_new(NULL);
143 143 gtk_container_add(GTK_CONTAINER(frame), eventbox);
144   - g_signal_connect(eventbox , "enter-notify-event"
145   - , GTK_SIGNAL_FUNC(face_enter_notify_event)
  144 + g_signal_connect(eventbox , "enter-notify-event"
  145 + , G_CALLBACK(face_enter_notify_event)
146 146 , frame);
147   - g_signal_connect(eventbox , "leave-notify-event"
148   - , GTK_SIGNAL_FUNC(face_leave_notify_event)
  147 + g_signal_connect(eventbox , "leave-notify-event"
  148 + , G_CALLBACK(face_leave_notify_event)
149 149 , frame);
150 150 gtk_table_attach_defaults(GTK_TABLE(table), frame
151 151 , j, j + 1, i, i + 1);
@@ -171,9 +171,9 @@ static void qq_face_popup_windowclass_init(QQFacePopupWindowClass *klass)
171 171 //install the 'face-clicked' signal
172 172 klass -> face_clicked_default_handler = default_handler;
173 173 //void signal_handler(gpointer instance, gint face, gpointer data)
174   - klass -> face_clicked_signal_id =
  174 + klass -> face_clicked_signal_id =
175 175 g_signal_new("face-clicked"
176   - , G_TYPE_FROM_CLASS(klass)
  176 + , G_TYPE_FROM_CLASS(klass)
177 177 , G_SIGNAL_RUN_LAST //run after the default handler
178 178 , G_STRUCT_OFFSET(QQFacePopupWindowClass
179 179 , face_clicked_default_handler)

0 comments on commit 5548adc

Please sign in to comment.
Something went wrong with that request. Please try again.