Mercurial > pidgin
changeset 15451:ce2446107ef3
merge of '704ad318e326940d16a5890ba527b24330ffbe47'
and 'b022b66c5d07ddd4ca050aec4b9b390ccfb85b9c'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sun, 28 Jan 2007 20:21:08 +0000 |
| parents | d79ca56a4626 (diff) 2841294e0dbb (current diff) |
| children | c6115dc73b28 |
| files | pidgin/pixmaps/emotes/default/22/scalable/Makefile.mingw |
| diffstat | 19 files changed, 192 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/config.h.mingw Sun Jan 28 20:20:51 2007 +0000 +++ b/config.h.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -643,3 +643,5 @@ #define HAVE_VSNPRINTF 1 #define SIZEOF_TIME_T 4 + +#define PIDGIN_NAME "Pidgin"
--- a/pidgin/gtkdebug.c Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/gtkdebug.c Sun Jan 28 20:21:08 2007 +0000 @@ -182,7 +182,7 @@ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), hbox); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
--- a/pidgin/pixmaps/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -47,11 +47,6 @@ typed.png \ typing.png \ Makefile.mingw \ - smileys/Makefile.mingw \ - smileys/default/Makefile.mingw \ - smileys/none/Makefile.mingw \ - status/default/Makefile.mingw \ - status/Makefile.mingw \ gaim-install.ico \ gaim.ico \ gaim_16.ico \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/16/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgindialogpix_DATA)'; then \ + mkdir -p $(pidgindialogpixdir); \ + cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/64/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidgindialogpix_DATA)'; then \ + mkdir -p $(pidgindialogpixdir); \ + cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \ + fi; +
--- a/pidgin/pixmaps/dialogs/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/dialogs/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -1,1 +1,6 @@ SUBDIRS = 16 64 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw \ + 64/Makefile.mingw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/dialogs/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginemblempix_DATA)'; then \ + mkdir -p $(pidginemblempixdir); \ + cp $(pidginemblempix_DATA) $(pidginemblempixdir); \ + fi; +
--- a/pidgin/pixmaps/emblems/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/emblems/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -1,1 +1,5 @@ SUBDIRS = 16 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;
--- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.mingw Sun Jan 28 20:20:51 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# -# Makefile.mingw -# -# Description: Makefile for win32 (mingw) version of Pidgin pixmaps -# - -.PHONY: install - -install: -
--- a/pidgin/pixmaps/emotes/default/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -2,4 +2,3 @@ EXTRA_DIST= \ 22/Makefile.mingw - 22/22/scalable/Makefile.mingw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginprotocolpix_DATA)'; then \ + mkdir -p $(pidginprotocolpixdir); \ + cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \ + fi; +
--- a/pidgin/pixmaps/protocols/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/protocols/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -1,1 +1,8 @@ SUBDIRS = 16 22 48 + +EXTRA_DIST = \ + Makefile.mingw \ + 16/Makefile.mingw \ + 22/Makefile.mingw \ + 48/Makefile.mingw +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/Makefile.mingw Sun Jan 28 20:21:08 2007 +0000 @@ -0,0 +1,16 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +include ./Makefile.am + +.PHONY: install + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;
--- a/pidgin/pixmaps/status/Makefile.am Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/pixmaps/status/Makefile.am Sun Jan 28 20:21:08 2007 +0000 @@ -1,6 +1,7 @@ SUBDIRS = 16 22 32 EXTRA_DIST = \ + Makefile.mingw \ 16/Makefile.mingw \ 22/Makefile.mingw \ 32/Makefile.mingw
--- a/pidgin/plugins/cap/cap.c Sun Jan 28 20:20:51 2007 +0000 +++ b/pidgin/plugins/cap/cap.c Sun Jan 28 20:21:08 2007 +0000 @@ -136,6 +136,8 @@ g_free(stats->prediction); /* g_free(stats->hourly_usage); */ /* g_free(stats->daily_usage); */ + if (stats->timeout_source_id != 0) + g_source_remove(stats->timeout_source_id); g_free(stats); } @@ -345,6 +347,7 @@ static void sent_im_msg(GaimAccount *account, const char *receiver, const char *message) { GaimBuddy *buddy; guint interval, words; + CapStatistics *stats = NULL; buddy = gaim_find_buddy(account, receiver); @@ -354,7 +357,7 @@ interval = gaim_prefs_get_int("/plugins/gtk/cap/max_msg_difference") * 1000 * 60; words = word_count(message); - CapStatistics *stats = get_stats_for(buddy); + stats = get_stats_for(buddy); insert_word_count(gaim_account_get_username(account), receiver, words); stats->last_message = time(NULL);