projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified webpage: now tinymail repository is in gitorious.
[modest]
/
src
/
modest-email-clipboard.c
diff --git
a/src/modest-email-clipboard.c
b/src/modest-email-clipboard.c
index
5c898ca
..
0a71d88
100644
(file)
--- a/
src/modest-email-clipboard.c
+++ b/
src/modest-email-clipboard.c
@@
-27,6
+27,7
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <modest-defs.h>
#include <modest-email-clipboard.h>
#include <modest-tny-folder.h>
#include <modest-email-clipboard.h>
#include <modest-tny-folder.h>
@@
-38,7
+39,6
@@
static void modest_email_clipboard_finalize (GObject * obj);
/* globals */
static GObjectClass *parent_class = NULL;
/* globals */
static GObjectClass *parent_class = NULL;
-typedef struct _ModestEmailClipboardPrivate ModestEmailClipboardPrivate;
struct _ModestEmailClipboardPrivate {
TnyList *selection;
TnyFolder *src;
struct _ModestEmailClipboardPrivate {
TnyList *selection;
TnyFolder *src;
@@
-57,7
+57,7
@@
modest_email_clipboard_get_type (void)
{
static GType my_type = 0;
{
static GType my_type = 0;
- if (!my_type) {
+ if (G_UNLIKELY (!my_type)) {
static const GTypeInfo my_info = {
sizeof (ModestEmailClipboardClass),
NULL, /* base init */
static const GTypeInfo my_info = {
sizeof (ModestEmailClipboardClass),
NULL, /* base init */
@@
-99,13
+99,14
@@
modest_email_clipboard_class_init (ModestEmailClipboardClass * klass)
static void
modest_email_clipboard_init (ModestEmailClipboard * obj)
{
static void
modest_email_clipboard_init (ModestEmailClipboard * obj)
{
- ModestEmailClipboardPrivate *priv =
- MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
+
+ if (obj->priv == NULL)
+ obj->priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
- priv->src = NULL;
- priv->selection = NULL;
- priv->hidding = NULL;
- priv->delete = FALSE;
+ obj->priv->src = NULL;
+ obj->priv->selection = NULL;
+ obj->priv->hidding = NULL;
+ obj->priv->delete = FALSE;
}
static void
}
static void
@@
-119,13
+120,10
@@
modest_email_clipboard_finalize (GObject * obj)
ModestEmailClipboard *
ModestEmailClipboard *
-modest_email_clipboard_new ()
+modest_email_clipboard_new (void)
{
GObject *obj;
{
GObject *obj;
- ModestEmailClipboardPrivate *priv;
-
obj = G_OBJECT (g_object_new (MODEST_TYPE_EMAIL_CLIPBOARD, NULL));
obj = G_OBJECT (g_object_new (MODEST_TYPE_EMAIL_CLIPBOARD, NULL));
- priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
return MODEST_EMAIL_CLIPBOARD (obj);
}
return MODEST_EMAIL_CLIPBOARD (obj);
}
@@
-198,7
+196,7
@@
modest_email_clipboard_set_data (ModestEmailClipboard *self,
while (!tny_iterator_is_done (iter)) {
obj = tny_iterator_get_current (iter);
if (obj && TNY_IS_HEADER (obj))
while (!tny_iterator_is_done (iter)) {
obj = tny_iterator_get_current (iter);
if (obj && TNY_IS_HEADER (obj))
- id = g_strdup(tny_header_get_message_id (TNY_HEADER (obj)));
+ id = tny_header_dup_message_id (TNY_HEADER (obj));
priv->hidding[i++] = id;
tny_iterator_next (iter);
priv->hidding[i++] = id;
tny_iterator_next (iter);
@@
-247,20
+245,18
@@
modest_email_clipboard_clear (ModestEmailClipboard *self)
gboolean
modest_email_clipboard_cleared (ModestEmailClipboard *self)
{
gboolean
modest_email_clipboard_cleared (ModestEmailClipboard *self)
{
- ModestEmailClipboardPrivate *priv = NULL;;
gboolean cleared = FALSE;
g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (self), TRUE);
gboolean cleared = FALSE;
g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (self), TRUE);
- priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (self);
- cleared = ((priv->src == NULL) && (priv->selection == NULL));
+ cleared = ((self->priv->src == NULL) && (self->priv->selection == NULL));
return cleared;
}
gboolean
modest_email_clipboard_check_source_folder (ModestEmailClipboard *self,
return cleared;
}
gboolean
modest_email_clipboard_check_source_folder (ModestEmailClipboard *self,
- const TnyFolder *folder)
+ TnyFolder *folder)
{
TnyFolderType folder_type1;
TnyFolderType folder_type2;
{
TnyFolderType folder_type1;
TnyFolderType folder_type2;