Commit 3d69d33dbb36329cab163c5f21743c56726b59e3 - gmtp

+1

-0

.cvsignore less more

gmtp

+5

-0

ChangeLog less more

	0	-- v1.3.1 - 20 Feb 2012
	1	* Change default to ask for Download folder upon initial installation.
	2	* Fix folder view on devices with multiple storage pools (Android enhancement).
	3	* Change album metadata update error only once during file upload session. (Android enhancement).
	4
0	5	-- v1.3.0 - 25 Dec 2011
1	6	+ Added folder name to title bar as per Gnome 2.0 HIG Section 2.1.
2	7	+ Added search toolbar for searching for files/tracks/folders on the device.

+1

-1

Makefile less more

1	1
2	2	PKG_NAME = gmtp
3	3	PREFIX ?= /usr/local
4		VER = 1.3.0
	4	VER = 1.3.1
5	5	# Note: If you update above, please update the config.h and pkginfo file as well.
6	6
7	7	PKG = gmtp

+1

-1

README less more

0		gMTP v1.3.0
	0	gMTP v1.3.1
1	1
2	2	A basic MP3 Player client for Oracle Solaris 10.
3	3

+1

-1

misc/gMTP.schemas less more

16	16	<owner>gMTP</owner>
17	17	<type>bool</type>
18	18	<locale name="C">
19		<default>false</default>
	19	<default>true</default>
20	20	<short>Always Prompt for Download Path</short>
21	21	<long>Always Prompt for Download Path</long>
22	22	</locale>

+1

-1

misc/org.gnome.gmtp.gschema.xml less more

5	5	<description>Auto Connect Device on Start</description>
6	6	</key>
7	7	<key name="promptdownloadpath" type="b">
8		<default>false</default>
	8	<default>true</default>
9	9	<summary>Always Prompt for Download Path</summary>
10	10	<description>Always Prompt for Download Path</description>
11	11	</key>

+1

-0

src/callbacks.c less more

154	154	//tmpFolderID = currentFolderID;
155	155	currentFolderID = (uint32_t) targetFol;
156	156	}
	157	AlbumErrorIgnore = FALSE;
157	158	if (files != NULL)
158	159	g_slist_foreach(files, (GFunc) __filesAdd, NULL);
159	160

+1

-1

src/config.h less more

20	20
21	21	#define PACKAGE "gmtp"
22	22	#define PACKAGE_TITLE "gMTP"
23		#define PACKAGE_VERSION "1.3.0"
	23	#define PACKAGE_VERSION "1.3.1"
24	24
25	25	#define GMTP_GSETTINGS_SCHEMA "org.gnome.gmtp"
26	26

+3

-1

src/dnd.c less more

79	79	} else {
80	80	addTrackPlaylistID = GMTP_NO_PLAYLIST;
81	81	}
	82	AlbumErrorIgnore = FALSE;
82	83	// Add the files.
83	84	if (files != NULL) {
84	85	g_slist_foreach(files, (GFunc) __filesAdd, NULL);

141	142	} else {
142	143	addTrackPlaylistID = GMTP_NO_PLAYLIST;
143	144	}
144
	145	AlbumErrorIgnore = FALSE;
145	146	// Add the files.
146	147	if (files != NULL) {
147	148	g_slist_foreach(files, (GFunc) __filesAdd, NULL);

309	310	} else {
310	311	addTrackPlaylistID = GMTP_NO_PLAYLIST;
311	312	}
	313	AlbumErrorIgnore = FALSE;
312	314	// Upload our given files in the current selected folder.
313	315	if (filelist != NULL) {
314	316	g_slist_foreach(filelist, (GFunc) __filesAdd, NULL);

+38

-31

src/interface.c less more

1832	1832	}
1833	1833
1834	1834	while (folders != NULL) {
1835
1836		image = gdk_pixbuf_new_from_file(file_folder_png, NULL);
1837		// Now add in the row information.
1838		gtk_tree_store_append(GTK_TREE_STORE(folderList), &rowIter, parent);
1839		gtk_tree_store_set(GTK_TREE_STORE(folderList), &rowIter,
1840		//COL_FOL_NAME, folders->name,
1841		COL_FOL_NAME_HIDDEN, folders->name,
1842		COL_FOL_ID, folders->folder_id,
1843		COL_FOL_ICON, image,
1844		-1);
1845
1846		// Indicate we are done with this image.
1847		g_object_unref(image);
1848		if (folders->child != NULL) {
1849		// Call our child.
1850		folderListAdd(folders->child, &rowIter);
	1835	// Only add in folder if it's in the current storage device.
	1836	if (folders->storage_id == DeviceMgr.devicestorage->id) {
	1837
	1838	image = gdk_pixbuf_new_from_file(file_folder_png, NULL);
	1839	// Now add in the row information.
	1840	gtk_tree_store_append(GTK_TREE_STORE(folderList), &rowIter, parent);
	1841	gtk_tree_store_set(GTK_TREE_STORE(folderList), &rowIter,
	1842	//COL_FOL_NAME, folders->name,
	1843	COL_FOL_NAME_HIDDEN, folders->name,
	1844	COL_FOL_ID, folders->folder_id,
	1845	COL_FOL_ICON, image,
	1846	-1);
	1847
	1848	// Indicate we are done with this image.
	1849	g_object_unref(image);
	1850	if (folders->child != NULL) {
	1851	// Call our child.
	1852	folderListAdd(folders->child, &rowIter);
	1853	}
1851	1854	}
1852	1855	folders = folders->sibling;
1853	1856	}

5669	5672
5670	5673	while (folders != NULL) {
5671	5674
5672		image = gdk_pixbuf_new_from_file(file_folder_png, NULL);
5673		// Now add in the row information.
5674		gtk_tree_store_append(GTK_TREE_STORE(fl), &rowIter, parent);
5675		gtk_tree_store_set(GTK_TREE_STORE(fl), &rowIter,
5676		//COL_FOL_NAME, folders->name,
5677		COL_FOL_NAME_HIDDEN, folders->name,
5678		COL_FOL_ID, folders->folder_id,
5679		COL_FOL_ICON, image,
5680		-1);
5681
5682		// Indicate we are done with this image.
5683		g_object_unref(image);
5684		if (folders->child != NULL) {
5685		// Call our child.
5686		folderListAddDialog(folders->child, &rowIter, fl);
	5675	// Only add in folder if it's in the current storage device.
	5676	if (folders->storage_id == DeviceMgr.devicestorage->id) {
	5677
	5678	image = gdk_pixbuf_new_from_file(file_folder_png, NULL);
	5679	// Now add in the row information.
	5680	gtk_tree_store_append(GTK_TREE_STORE(fl), &rowIter, parent);
	5681	gtk_tree_store_set(GTK_TREE_STORE(fl), &rowIter,
	5682	//COL_FOL_NAME, folders->name,
	5683	COL_FOL_NAME_HIDDEN, folders->name,
	5684	COL_FOL_ID, folders->folder_id,
	5685	COL_FOL_ICON, image,
	5686	-1);
	5687
	5688	// Indicate we are done with this image.
	5689	g_object_unref(image);
	5690	if (folders->child != NULL) {
	5691	// Call our child.
	5692	folderListAddDialog(folders->child, &rowIter, fl);
	5693	}
5687	5694	}
5688	5695	folders = folders->sibling;
5689	5696	}

+11

-2

src/mtp.c less more

95	95
96	96	static gchar* blank_ext = "";
97	97
	98	// Ignore Album errors?
	99
	100	gboolean AlbumErrorIgnore = FALSE;
	101
98	102	// ************************************************************************************************
99	103
100	104	/**

1260	1264	albuminfo->tracks = NULL;
1261	1265	}
1262	1266	if (ret != 0) {
1263		displayError(_("Error creating or updating album.\n(This could be due to that your device does not support albums.)\n"));
1264		g_fprintf(stderr, _("Error creating or updating album.\n(This could be due to that your device does not support albums.)\n"));
	1267
	1268	if (AlbumErrorIgnore == FALSE) {
	1269	displayError(_("Error creating or updating album.\n(This could be due to that your device does not support albums.)\n"));
	1270	g_fprintf(stderr, _("Error creating or updating album.\n(This could be due to that your device does not support albums.)\n"));
	1271	}
	1272	// Displayed the message once already per transfer...
	1273	AlbumErrorIgnore = TRUE;
1265	1274	LIBMTP_Dump_Errorstack(DeviceMgr.device);
1266	1275	LIBMTP_Clear_Errorstack(DeviceMgr.device);
1267	1276	}

+2

-0

src/mtp.h less more

33	33	};
34	34
35	35	#define MTP_DEVICE_SINGLE_STORAGE -1
	36
	37	gboolean AlbumErrorIgnore;
36	38
37	39	typedef struct {
38	40	gchar* file_extension;

+7

-7

web/gMTP.html less more

18	18	<script src="scripts/frog.js" type="text/javascript"> </script>
19	19
20	20
21		<title>gMTP v1.3.0 - A simple MP3 and Media Player Client for UNIX and UNIX like systems</title>
	21	<title>gMTP v1.3.1 - A simple MP3 and Media Player Client for UNIX and UNIX like systems</title>
22	22	</head>
23	23	<body onload="SetDefaultView();">
24	24

55	55	<div id="ContentArea">
56	56
57	57	<div id="DivHome">
58		<h2>gMTP v1.3.0</h2>
	58	<h2>gMTP v1.3.1</h2>
59	59	<p>
60	60	A simple MP3 and Media player client for UNIX and UNIX like systems.</p>
61	61	<p>

92	92	<li>Oracle Solaris 10, other UNIX or UNIX-like system</li>
93	93	<li>libvorbis (v1.0.1)</li>
94	94	<li>libflac (v1.2+) - <a href="http://flac.sourceforge.net/index.html">FLAC Hompage</a> </li>
95		<li>libmtp (v1.0.0) - <a href="http://libmtp.sourceforge.net/">LIBMTP Hompage</a> </li>
	95	<li>libmtp (v1.0.2) - <a href="http://libmtp.sourceforge.net/">LIBMTP Hompage</a> </li>
96	96	<li>libid3tag (v0.15.1b) - <a href="http://sourceforge.net/projects/mad/files/">MAD Download Page</a> </li>
97	97	<li>GTK2+ Version. (Recommended for Solaris, FreeBSD and older Linux Distributions)
98	98	<ul>

115	115	<h2><a id="Installation">Installation (Binary)</a></h2>
116	116	<dl>
117	117	<dt>Oracle Solaris 10</dt>
118		<dd>Download SYSV package, gunzip it and use 'pkgadd -d gMTP-1.3.0-i386.pkg' to install.</dd>
	118	<dd>Download SYSV package, gunzip it and use 'pkgadd -d gMTP-1.3.1-i386.pkg' to install.</dd>
119	119	<dt>Debian GNU/Linux</dt>
120	120	<dd>gMTP is available in the unstable (sid) package lists. Use 'apt-get' to install.</dd>
121	121	<dt>Ubuntu</dt>

222	222	<h2><a id="Downloads">Downloads</a></h2>
223	223	<h3>Current Release</h3>
224	224	<p>
225		gMTP Source: <a href="http://sourceforge.net/projects/gmtp/files/gMTP-1.3.0/gmtp-1.3.0-i386.tar.gz/download">gMTP-1.3.0-i386.tar.gz</a></p>
226		<p>
227		gMTP Solaris 10 Package: <a href="http://sourceforge.net/projects/gmtp/files/gMTP-1.3.0/gmtp-1.3.0-i386.pkg.gz/download">gMTP-1.3.0-i386.pkg.gz</a> (Warning: Does NOT
	225	gMTP Source: <a href="http://sourceforge.net/projects/gmtp/files/gMTP-1.3.1/gmtp-1.3.1-i386.tar.gz/download">gMTP-1.3.1-i386.tar.gz</a></p>
	226	<p>
	227	gMTP Solaris 10 Package: <a href="http://sourceforge.net/projects/gmtp/files/gMTP-1.3.1/gmtp-1.3.1-i386.pkg.gz/download">gMTP-1.3.1-i386.pkg.gz</a> (Warning: Does NOT
228	228	contain libmtp, libflac or libid3tag).</p>
229	229	<h3>Previous Releases</h3>
230	230	<p>