Mercurial > pidgin
changeset 15924:5f9b7e2652f0
merge of '04076a446ca2bc48c37d00b8b255bc1311b6c51c'
and '8a20c90142cacba36041509da3a0e11499df3ebc'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 26 Mar 2007 02:48:09 +0000 |
| parents | f771cdcc551a (diff) f8c16848b76d (current diff) |
| children | 9ac4e6b097d3 2b8d4fabc103 |
| files | doc/gaims_funniest_home_convos.txt finch/gntrequest.c finch/libgnt/gntfilesel.c finch/libgnt/gntfilesel.h gaim.apspec.in gaim.spec.in libpurple/gaim-client-example.c libpurple/gaim-client.c libpurple/gaim-notifications-example libpurple/gaim-remote libpurple/gaim-send libpurple/gaim-send-async libpurple/gaim-url-handler libpurple/gaim.h libpurple/gconf/gaim.schemas.in libpurple/plugins/Makefile.am libpurple/plugins/gaim.pl libpurple/plugins/mono/api/GaimPlugin.cs libpurple/plugins/perl/libgaimperl.c m4macros/gaim.m4 pidgin/Makefile.am pidgin/gtkutils.c pidgin/pixmaps/Makefile.am pidgin/pixmaps/gaim.ico pidgin/pixmaps/gaim.png pidgin/pixmaps/gaim.svg pidgin/pixmaps/pidgin.png pidgin/plugins/crazychat/cc_gaim_plugin.c pidgin/plugins/gaimrc.c |
| diffstat | 7 files changed, 29 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntrequest.c Mon Mar 26 01:19:59 2007 +0000 +++ b/finch/gntrequest.c Mon Mar 26 02:48:09 2007 +0000 @@ -28,7 +28,6 @@ #include <gntcheckbox.h> #include <gntcombobox.h> #include <gntentry.h> -#include <gntfilesel.h> #include <gntlabel.h> #include <gntline.h> #include <gnttree.h> @@ -40,7 +39,7 @@ typedef struct { void *user_data; - GntWidget *dialog; + GntWidget *entry, *dialog; GCallback *cbs; } PurpleGntFileRequest; @@ -550,10 +549,8 @@ file_ok_cb(GntWidget *wid, gpointer fq) { PurpleGntFileRequest *data = fq; - char *file = gnt_file_sel_get_selected_file(GNT_FILE_SEL(data->dialog)); if (data->cbs[0] != NULL) - ((PurpleRequestFileCb)data->cbs[0])(data->user_data, file); - g_free(file); + ((PurpleRequestFileCb)data->cbs[0])(data->user_data, gnt_entry_get_text(GNT_ENTRY(data->entry))); purple_request_close(PURPLE_REQUEST_FILE, data->dialog); } @@ -571,8 +568,8 @@ GCallback ok_cb, GCallback cancel_cb, void *user_data) { - GntWidget *window = gnt_file_sel_new(); - GntFileSel *sel = GNT_FILE_SEL(window); + GntWidget *window = gnt_vbox_new(FALSE); + GntWidget *entry, *hbox, *button; PurpleGntFileRequest *data = g_new0(PurpleGntFileRequest, 1); data->user_data = user_data; @@ -580,14 +577,30 @@ data->cbs[0] = ok_cb; data->cbs[1] = cancel_cb; data->dialog = window; + data->entry = entry = gnt_entry_new(g_strconcat(purple_home_dir(), G_DIR_SEPARATOR_S, filename, NULL)); + gnt_widget_set_size(entry, 30, 1); + gnt_box_set_toplevel(GNT_BOX(window), TRUE); gnt_box_set_title(GNT_BOX(window), title ? title : (savedialog ? _("Save File...") : _("Open File..."))); - gnt_file_sel_set_current_location(sel, purple_home_dir()); /* XXX: may be remember the position and restore here? */ +#if 0 + /* After the string freeze */ + gnt_box_add_widget(GNT_BOX(window), gnt_label_new(_("Please enter a full path for a file"))); +#endif + gnt_box_add_widget(GNT_BOX(window), entry); - g_signal_connect(G_OBJECT(sel->cancel), "activate", - G_CALLBACK(file_cancel_cb), data); + hbox = gnt_hbox_new(TRUE); + gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID); - g_signal_connect(G_OBJECT(sel->select), "activate", + button = gnt_button_new(_("Cancel")); + g_signal_connect(G_OBJECT(button), "activate", + G_CALLBACK(file_cancel_cb), data); + gnt_box_add_widget(GNT_BOX(hbox), button); + + button = gnt_button_new(_("OK")); + g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(file_ok_cb), data); + gnt_box_add_widget(GNT_BOX(hbox), button); + + gnt_box_add_widget(GNT_BOX(window), hbox); g_signal_connect_swapped(G_OBJECT(window), "destroy", G_CALLBACK(file_request_destroy), data);
--- a/libpurple/example/nullclient.c Mon Mar 26 01:19:59 2007 +0000 +++ b/libpurple/example/nullclient.c Mon Mar 26 02:48:09 2007 +0000 @@ -28,6 +28,7 @@ #include "ft.h" #include "log.h" #include "notify.h" +#include "prefix.h" #include "prefs.h" #include "prpl.h" #include "pounce.h"
--- a/libpurple/plugins/Makefile.am Mon Mar 26 01:19:59 2007 +0000 +++ b/libpurple/plugins/Makefile.am Mon Mar 26 02:48:09 2007 +0000 @@ -18,6 +18,7 @@ SUBDIRS = \ $(MONO_DIR) \ + $(PERL_DIR) \ ssl \ $(TCL_DIR)
--- a/libpurple/plugins/perl/common/Makefile.PL.in Mon Mar 26 01:19:59 2007 +0000 +++ b/libpurple/plugins/perl/common/Makefile.PL.in Mon Mar 26 02:48:09 2007 +0000 @@ -9,7 +9,7 @@ ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => '@srcdir@/Purple.pm', # retrieve abstract from module AUTHOR => 'Purple <http://pidgin.im/>') : ()), - 'LIBS' => ['@GLIB_LIBS@', ''], # e.g., '-lm' + 'LIBS' => [''], # e.g., '-lm' 'DEFINE' => '@DEBUG_CFLAGS@', # e.g., '-DHAVE_SOMETHING' 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other' 'OBJECT' => '$(O_FILES)', # link all the C files too
--- a/pidgin/Makefile.am Mon Mar 26 01:19:59 2007 +0000 +++ b/pidgin/Makefile.am Mon Mar 26 02:48:09 2007 +0000 @@ -64,7 +64,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pidgin.pc -SUBDIRS = plugins +SUBDIRS = pixmaps plugins sounds bin_PROGRAMS = pidgin