changeset 18487:c583fb84c339

merge of 'b659e4319ac48c0a72be9f116d4bd41477552998' and 'd7c71ed89067d861b85108f04ea056f23320d33d'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 11 Jul 2007 18:57:46 +0000
parents 472fa448e93d (current diff) 8af9ebae439c (diff)
children 58d1df75c91c
files
diffstat 6 files changed, 150 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Wed Jul 11 18:24:11 2007 +0000
+++ b/ChangeLog.API	Wed Jul 11 18:57:46 2007 +0000
@@ -28,6 +28,7 @@
 		    longer than 1 second away.  Be aware of the rounding, though.
 		* purple_xfer_get_remote_user
 		* purple_pounces_get_all_for_ui
+		* purple_prefs_get_children_names
 
 		Changed:
 		* The documentation of the following functions now properly
@@ -104,6 +105,8 @@
 			* gnt_window_present
 			* gnt_tree_set_column_width_ratio
 			* gnt_tree_set_column_resizable
+			* gnt_tree_set_column_is_right_aligned
+			* 'file-selected' signal is emited for GntFileSel
 
 			Changed:
 			* gnt_tree_get_rows() now returns a GList* instead of a const
--- a/finch/Makefile.am	Wed Jul 11 18:24:11 2007 +0000
+++ b/finch/Makefile.am	Wed Jul 11 18:57:46 2007 +0000
@@ -25,6 +25,7 @@
 	gntpounce.c \
 	gntprefs.c \
 	gntrequest.c \
+	gntsound.c \
 	gntstatus.c \
 	gntui.c
 
@@ -42,6 +43,7 @@
 	gntpounce.h \
 	gntprefs.h \
 	gntrequest.h \
+	gntsound.h \
 	gntstatus.h \
 	gntui.h
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/finch/gntsound.c	Wed Jul 11 18:57:46 2007 +0000
@@ -0,0 +1,49 @@
+/**
+ * @file gntsound.c GNT Sound API
+ * @ingroup finch
+ *
+ * finch
+ *
+ * Finch is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include "gntsound.h"
+
+const char *finch_sound_get_active_profile(void)
+{
+	return NULL;
+}
+
+void finch_sound_set_active_profile(const char *name)
+{
+}
+
+GList *finch_sound_get_profiles(void)
+{
+	return NULL;
+}
+
+PurpleSoundUiOps *finch_sound_get_ui_ops(void)
+{
+	return NULL;
+}
+
+void finch_sounds_show_all(void)
+{
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/finch/gntsound.h	Wed Jul 11 18:57:46 2007 +0000
@@ -0,0 +1,71 @@
+/**
+ * @file gntsound.h GNT Sound API
+ * @ingroup finch
+ *
+ * finch
+ *
+ * Finch is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _GNT_SOUND_H
+#define _GNT_SOUND_H
+
+#include "sound.h"
+
+/**********************************************************************/
+/** @name GNT Sound API                                               */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * Get the name of the active sound profile.
+ *
+ * @return The name of the profile
+ */
+const char *finch_sound_get_active_profile(void);
+
+/**
+ * Set the active profile.  If the profile doesn't exist, nothing is changed.
+ * 
+ * @param name  The name of the profile
+ */
+void finch_sound_set_active_profile(const char *name);
+
+/**
+ * Get a list of available sound profiles.
+ *
+ * @return A list of strings denoting sound profile names.
+ *         Caller must free the list (but not the data).
+ */
+GList *finch_sound_get_profiles(void);
+
+/**
+ * Gets GNT sound UI ops.
+ *
+ * @return The UI operations structure.
+ */
+PurpleSoundUiOps *finch_sound_get_ui_ops(void);
+
+/**
+ * Show the sound settings dialog.
+ */
+void finch_sounds_show_all(void);
+
+/*@}*/
+
+#endif
--- a/libpurple/prefs.c	Wed Jul 11 18:24:11 2007 +0000
+++ b/libpurple/prefs.c	Wed Jul 11 18:57:46 2007 +0000
@@ -1325,6 +1325,22 @@
 	disco_callback_helper_handle(&prefs, handle);
 }
 
+GList *
+purple_prefs_get_children_names(const char *name)
+{
+	GList * list = NULL;
+	struct purple_pref *pref = find_pref(name), *child;
+
+	if (pref == NULL)
+		return NULL;
+
+	for (child = pref->first_child; child; child = child->sibling) {
+		list = g_list_append(list, g_strdup(child->name));
+	}
+	return list;
+
+}
+
 void
 purple_prefs_update_old()
 {
--- a/libpurple/prefs.h	Wed Jul 11 18:24:11 2007 +0000
+++ b/libpurple/prefs.h	Wed Jul 11 18:57:46 2007 +0000
@@ -281,6 +281,15 @@
  */
 GList *purple_prefs_get_path_list(const char *name);
 
+/*
+ * Returns a list of children for a pref
+ *
+ * @param name The parent pref
+ * @return A list of newly allocated strings denoting the names of the children.
+ *         Returns @c NULL if there are no children or if pref doesn't exist.
+ *         The caller must free all the strings and the list.
+ */
+GList *purple_prefs_get_children_names(const char *name);
 
 /**
  * Add a callback to a pref (and its children)