← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to addressbook/gui/widgets/eab-config.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/gui/widgets/eab-config.c
54
54
                                p->source_changed_id = 0;
55
55
                        }
56
56
                        break; }
 
57
                case EAB_CONFIG_TARGET_PREFS:
 
58
                        break;
57
59
                }
58
60
        }
59
61
 
64
66
                if (s->source)
65
67
                        g_object_unref (s->source);
66
68
                break; }
 
69
        case EAB_CONFIG_TARGET_PREFS: {
 
70
                EABConfigTargetPrefs *s = (EABConfigTargetPrefs *) t;
 
71
 
 
72
                if (s->gconf)
 
73
                        g_object_unref (s->gconf);
 
74
                break; }
67
75
        }
68
76
 
69
77
        ((EConfigClass *) ecp_parent_class)->target_free (ec, t);
91
99
                                s->source, "changed",
92
100
                                G_CALLBACK (ecp_source_changed), ec);
93
101
                        break; }
 
102
                case EAB_CONFIG_TARGET_PREFS:
 
103
                        break;
94
104
                }
95
105
        }
96
106
}
145
155
 
146
156
        return t;
147
157
}
 
158
 
 
159
EABConfigTargetPrefs *
 
160
eab_config_target_new_prefs (EABConfig *ecp, GConfClient *gconf)
 
161
{
 
162
        EABConfigTargetPrefs *t = e_config_target_new (
 
163
                &ecp->config, EAB_CONFIG_TARGET_PREFS, sizeof (*t));
 
164
 
 
165
        if (gconf)
 
166
                t->gconf = g_object_ref (gconf);
 
167
        else
 
168
                t->gconf = NULL;
 
169
 
 
170
        return t;
 
171
}