pidgin: c0e67e84: Fix notify plugin compile.
qulogic at pidgin.im
qulogic at pidgin.im
Thu Sep 8 22:01:03 EDT 2011
----------------------------------------------------------------------
Revision: c0e67e84e789609dfde90ea00f8d872931158498
Parent: 2b3e47800348fa0c34856cc978ec1ac36eae3912
Author: qulogic at pidgin.im
Date: 09/08/11 18:24:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c0e67e84e789609dfde90ea00f8d872931158498
Changelog:
Fix notify plugin compile.
Changes against parent 2b3e47800348fa0c34856cc978ec1ac36eae3912
patched pidgin/plugins/Makefile.am
patched pidgin/plugins/notify.c
-------------- next part --------------
============================================================
--- pidgin/plugins/notify.c a7ef531d7e3eae4cb58fd6b6ebe9e75ad6568e13
+++ pidgin/plugins/notify.c 4b4cf31eb47b8e7e438262821407e0d2b590ad95
@@ -303,7 +303,7 @@ attach_signals(PurpleConversation *conv)
attach_signals(PurpleConversation *conv)
{
PidginConversation *gtkconv = NULL;
- GSList *imhtml_ids = NULL, *entry_ids = NULL;
+ GSList *webview_ids = NULL, *entry_ids = NULL;
guint id;
gtkconv = PIDGIN_CONVERSATION(conv);
@@ -322,9 +322,9 @@ attach_signals(PurpleConversation *conv)
G_CALLBACK(unnotify_cb), conv);
entry_ids = g_slist_append(entry_ids, GUINT_TO_POINTER(id));
- id = g_signal_connect(G_OBJECT(gtkconv->imhtml), "focus-in-event",
+ id = g_signal_connect(G_OBJECT(gtkconv->webview), "focus-in-event",
G_CALLBACK(unnotify_cb), conv);
- imhtml_ids = g_slist_append(imhtml_ids, GUINT_TO_POINTER(id));
+ webview_ids = g_slist_append(webview_ids, GUINT_TO_POINTER(id));
}
if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_click")) {
@@ -334,9 +334,9 @@ attach_signals(PurpleConversation *conv)
G_CALLBACK(unnotify_cb), conv);
entry_ids = g_slist_append(entry_ids, GUINT_TO_POINTER(id));
- id = g_signal_connect(G_OBJECT(gtkconv->imhtml), "button-press-event",
+ id = g_signal_connect(G_OBJECT(gtkconv->webview), "button-press-event",
G_CALLBACK(unnotify_cb), conv);
- imhtml_ids = g_slist_append(imhtml_ids, GUINT_TO_POINTER(id));
+ webview_ids = g_slist_append(webview_ids, GUINT_TO_POINTER(id));
}
if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_type")) {
@@ -345,7 +345,7 @@ attach_signals(PurpleConversation *conv)
entry_ids = g_slist_append(entry_ids, GUINT_TO_POINTER(id));
}
- purple_conversation_set_data(conv, "notify-imhtml-signals", imhtml_ids);
+ purple_conversation_set_data(conv, "notify-webview-signals", webview_ids);
purple_conversation_set_data(conv, "notify-entry-signals", entry_ids);
return 0;
@@ -361,9 +361,9 @@ detach_signals(PurpleConversation *conv)
if (!gtkconv)
return;
- ids = purple_conversation_get_data(conv, "notify-imhtml-signals");
+ ids = purple_conversation_get_data(conv, "notify-webview-signals");
for (l = ids; l != NULL; l = l->next)
- g_signal_handler_disconnect(gtkconv->imhtml, GPOINTER_TO_INT(l->data));
+ g_signal_handler_disconnect(gtkconv->webview, GPOINTER_TO_INT(l->data));
g_slist_free(ids);
ids = purple_conversation_get_data(conv, "notify-entry-signals");
@@ -373,7 +373,7 @@ detach_signals(PurpleConversation *conv)
purple_conversation_set_data(conv, "notify-message-count", GINT_TO_POINTER(0));
- purple_conversation_set_data(conv, "notify-imhtml-signals", NULL);
+ purple_conversation_set_data(conv, "notify-webview-signals", NULL);
purple_conversation_set_data(conv, "notify-entry-signals", NULL);
}
============================================================
--- pidgin/plugins/Makefile.am 278f22aaf9a322a4ae696da2f37fc1192baea699
+++ pidgin/plugins/Makefile.am cf008a30f61ef3dce162ff12fb93feac53880ca8
@@ -35,6 +35,7 @@ iconaway_la_LDFLAGS = -module -a
gtk_signals_test_la_LDFLAGS = -module -avoid-version
gtkbuddynote_la_LDFLAGS = -module -avoid-version
iconaway_la_LDFLAGS = -module -avoid-version
+notify_la_LDFLAGS = -module -avoid-version
pidginrc_la_LDFLAGS = -module -avoid-version
relnot_la_LDFLAGS = -module -avoid-version
sendbutton_la_LDFLAGS = -module -avoid-version
@@ -50,6 +51,7 @@ plugin_LTLIBRARIES = \
extplacement.la \
gtkbuddynote.la \
iconaway.la \
+ notify.la \
pidginrc.la \
relnot.la \
sendbutton.la \
@@ -71,6 +73,7 @@ iconaway_la_SOURCES = iconaway.c
gtk_signals_test_la_SOURCES = gtk-signals-test.c
gtkbuddynote_la_SOURCES = gtkbuddynote.c
iconaway_la_SOURCES = iconaway.c
+notify_la_SOURCES = notify.c
pidginrc_la_SOURCES = pidginrc.c
relnot_la_SOURCES = relnot.c
sendbutton_la_SOURCES = sendbutton.c
@@ -84,6 +87,7 @@ iconaway_la_LIBADD = $(GTK_LIBS
gtk_signals_test_la_LIBADD = $(GTK_LIBS)
gtkbuddynote_la_LIBADD = $(GTK_LIBS)
iconaway_la_LIBADD = $(GTK_LIBS)
+notify_la_LIBADD = $(GTK_LIBS)
pidginrc_la_LIBADD = $(GTK_LIBS)
relnot_la_LIBADD = $(GLIB_LIBS)
sendbutton_la_LIBADD = $(GTK_LIBS)
More information about the Commits
mailing list