diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-24 20:54:57 +0800 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-27 17:23:48 +0800 |
| commit | 7c2d23958c938a73eefbd35c2ecfb74fc57c1421 (patch) | |
| tree | 0bc6f7a1766151dde07e10d6977d9e62b52836b3 | |
| parent | 5b5f330cef05c8ebaa5ded6c74992910d7d85999 (diff) | |
| download | gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar.gz gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar.bz2 gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar.lz gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar.xz gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.tar.zst gsoc2013-empathy-7c2d23958c938a73eefbd35c2ecfb74fc57c1421.zip | |
Rename EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_* to *_FEATURE_INDIVIDUAL_*
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 14 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.h | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 245ea1643..56ee47ec3 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -529,8 +529,8 @@ individual_view_drag_motion (GtkWidget *widget, We only highlight things if the contact is from a different Individual view, or if this Individual view has FEATURE_GROUPS_CHANGE. This prevents highlighting in Individual views which don't have - FEATURE_GROUPS_CHANGE, but do have FEATURE_CONTACT_DRAG and - FEATURE_CONTACT_DROP. + FEATURE_GROUPS_CHANGE, but do have FEATURE_INDIVIDUAL_DRAG and + FEATURE_INDIVIDUAL_DROP. */ GtkTreeIter group_iter; gboolean is_group; @@ -1746,10 +1746,10 @@ individual_view_set_view_features (EmpathyIndividualView *view, is enabled). */ gtk_tree_view_set_reorderable (GTK_TREE_VIEW (view), - (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_DRAG)); + (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG)); /* Update DnD source/dest */ - if (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_DRAG) + if (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG) { gtk_drag_source_set (GTK_WIDGET (view), GDK_BUTTON1_MASK, @@ -1763,7 +1763,7 @@ individual_view_set_view_features (EmpathyIndividualView *view, } - if (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_DROP) + if (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP) { gtk_drag_dest_set (GTK_WIDGET (view), GTK_DEST_DEFAULT_ALL, @@ -1778,7 +1778,7 @@ individual_view_set_view_features (EmpathyIndividualView *view, /* Update has-tooltip */ has_tooltip = - (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_TOOLTIP) != 0; + (features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP) != 0; gtk_widget_set_has_tooltip (GTK_WIDGET (view), has_tooltip); } @@ -2228,7 +2228,7 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view) /* Remove contact */ if (priv->view_features & - EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_REMOVE && + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE && flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE) { diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index 6a65c7efa..a87848408 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -53,13 +53,13 @@ typedef enum EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_SAVE = 1 << 0, EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME = 1 << 1, EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_REMOVE = 1 << 2, - /* NOTE: For this to behave as expected, FEATURE_CONTACT_DRAG and - * FEATURE_CONTACT_DROP should also be specified. */ + /* NOTE: For this to behave as expected, FEATURE_INDIVIDUAL_DRAG and + * FEATURE_INDIVIDUAL_DROP should also be specified. */ EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE = 1 << 3, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_REMOVE = 1 << 4, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_DROP = 1 << 5, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_DRAG = 1 << 6, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_TOOLTIP = 1 << 7, + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE = 1 << 4, + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP = 1 << 5, + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG = 1 << 6, + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP = 1 << 7, EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP = 1 << 8, EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL = (1 << 9) - 1, } EmpathyIndividualViewFeatureFlags; |